From fe5b618484e9d1a06770c394dd3251229a5472eb Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Thu, 5 Feb 2015 17:38:34 -0800 Subject: fix compilation errors --- src/mbgl/style/style_parser.cpp | 12 ++++++------ 1 file 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 StyleParser::parseProperty(JSVal value, const char*) { JSVal rvalue = replaceConstant(value); if (rvalue.IsNumber()) { - return { true, rvalue.GetDouble() }; + return std::tuple { true, rvalue.GetDouble() }; } else { Log::Warning(Event::ParseStyle, "function argument must be a numeric value"); - return { false, 0.0f }; + return std::tuple { false, 0.0f }; } } template <> std::tuple StyleParser::parseProperty(JSVal value, const char*) { JSVal rvalue = replaceConstant(value); - return { true, parseColor(rvalue) }; + return std::tuple { true, parseColor(rvalue) }; } template <> @@ -264,7 +264,7 @@ std::tuple>> StyleParser::parseProperty(JSVal val Faded> parsed; JSVal rvalue = replaceConstant(value); parsed.to = std::get<1>(parseFloatArray(rvalue)); - return { true, parsed }; + return std::tuple>> { true, parsed }; } template <> @@ -273,10 +273,10 @@ std::tuple> StyleParser::parseProperty(JSVal value, con Faded parsed; if (rvalue.IsString()) { parsed.to = { value.GetString(), value.GetStringLength() }; - return { true, parsed }; + return std::tuple> { true, parsed }; } else { Log::Warning(Event::ParseStyle, "function argument must be a string"); - return { false, parsed }; + return std::tuple> { false, parsed }; } } -- cgit v1.2.1