summaryrefslogtreecommitdiff
path: root/include/mbgl/style/expression/parse/literal.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl/style/expression/parse/literal.hpp')
-rw-r--r--include/mbgl/style/expression/parse/literal.hpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/mbgl/style/expression/parse/literal.hpp b/include/mbgl/style/expression/parse/literal.hpp
index 1b4a00b074..90bea956a4 100644
--- a/include/mbgl/style/expression/parse/literal.hpp
+++ b/include/mbgl/style/expression/parse/literal.hpp
@@ -15,8 +15,7 @@ namespace style {
namespace expression {
struct ParseLiteral {
- template <class V>
- static ParseResult parse(const V& value, ParsingContext ctx) {
+ static ParseResult parse(const mbgl::style::conversion::Value& value, ParsingContext ctx) {
const optional<Value> parsedValue = parseValue(value, ctx);
if (!parsedValue) {
@@ -40,14 +39,14 @@ struct ParseLiteral {
}
return ParseResult(std::make_unique<Literal>(*parsedValue));
}
- template <class V>
- static optional<Value> parseValue(const V& value, ParsingContext ctx) {
+
+ static optional<Value> parseValue(const mbgl::style::conversion::Value& value, ParsingContext ctx) {
using namespace mbgl::style::conversion;
if (isUndefined(value)) return {Null};
if (isObject(value)) {
std::unordered_map<std::string, Value> result;
bool error = false;
- eachMember(value, [&] (const std::string& k, const V& v) -> optional<conversion::Error> {
+ eachMember(value, [&] (const std::string& k, const mbgl::style::conversion::Value& v) -> optional<conversion::Error> {
if (!error) {
optional<Value> memberValue = parseValue(v, ctx);
if (memberValue) {