summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnsis Brammanis <brammanis@gmail.com>2015-02-05 17:38:34 -0800
committerAnsis Brammanis <brammanis@gmail.com>2015-02-05 17:42:51 -0800
commitfe5b618484e9d1a06770c394dd3251229a5472eb (patch)
tree54639061742a49c16a8d8a44ad36b4631a6145c8 /src
parent968d6812db7b2754a671a309f925134e8c79d051 (diff)
downloadqtlocation-mapboxgl-fe5b618484e9d1a06770c394dd3251229a5472eb.tar.gz
fix compilation errors
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/style_parser.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp
index c9c711d46f..3244839a7d 100644
--- a/src/mbgl/style/style_parser.cpp
+++ b/src/mbgl/style/style_parser.cpp
@@ -246,17 +246,17 @@ template <>
std::tuple<bool, float> StyleParser::parseProperty(JSVal value, const char*) {
JSVal rvalue = replaceConstant(value);
if (rvalue.IsNumber()) {
- return { true, rvalue.GetDouble() };
+ return std::tuple<bool, float> { true, rvalue.GetDouble() };
} else {
Log::Warning(Event::ParseStyle, "function argument must be a numeric value");
- return { false, 0.0f };
+ return std::tuple<bool, float> { false, 0.0f };
}
}
template <>
std::tuple<bool, Color> StyleParser::parseProperty(JSVal value, const char*) {
JSVal rvalue = replaceConstant(value);
- return { true, parseColor(rvalue) };
+ return std::tuple<bool, Color> { true, parseColor(rvalue) };
}
template <>
@@ -264,7 +264,7 @@ std::tuple<bool, Faded<std::vector<float>>> StyleParser::parseProperty(JSVal val
Faded<std::vector<float>> parsed;
JSVal rvalue = replaceConstant(value);
parsed.to = std::get<1>(parseFloatArray(rvalue));
- return { true, parsed };
+ return std::tuple<bool, Faded<std::vector<float>>> { true, parsed };
}
template <>
@@ -273,10 +273,10 @@ std::tuple<bool, Faded<std::string>> StyleParser::parseProperty(JSVal value, con
Faded<std::string> parsed;
if (rvalue.IsString()) {
parsed.to = { value.GetString(), value.GetStringLength() };
- return { true, parsed };
+ return std::tuple<bool, Faded<std::string>> { true, parsed };
} else {
Log::Warning(Event::ParseStyle, "function argument must be a string");
- return { false, parsed };
+ return std::tuple<bool, Faded<std::string>> { false, parsed };
}
}