diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index 2dec648af..928392a8d 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -314,18 +314,6 @@ bool StyleParser::setProperty(JSVal value, const char *property_name, PropertyKe return parsed; } -template -bool StyleParser::setProperty(JSVal value, const char *property_name, T &target) { - bool parsed; - T result; - std::tie(parsed, result) = parseProperty(value, property_name); - if (parsed) { - target = std::move(result); - } - return parsed; -} - - template bool StyleParser::parseOptionalProperty(const char *property_name, PropertyKey key, ClassProperties &klass, JSVal value) { if (!value.HasMember(property_name)) { @@ -335,15 +323,6 @@ bool StyleParser::parseOptionalProperty(const char *property_name, PropertyKey k } } -template -bool StyleParser::parseOptionalProperty(const char *property_name, T &target, JSVal value) { - if (!value.HasMember(property_name)) { - return false; - } else { - return setProperty(replaceConstant(value[property_name]), property_name, target); - } -} - template<> std::tuple StyleParser::parseProperty(JSVal value, const char *property_name) { if (!value.IsString()) { Log::Warning(Event::ParseStyle, "value of '%s' must be a string", property_name); diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp index c37e85603..951f55478 100644 --- a/src/mbgl/style/style_parser.hpp +++ b/src/mbgl/style/style_parser.hpp @@ -69,11 +69,7 @@ private: template bool parseOptionalProperty(const char *property_name, const std::vector &keys, ClassProperties &klass, JSVal value); template - bool parseOptionalProperty(const char *property_name, T &target, JSVal value); - template bool setProperty(JSVal value, const char *property_name, PropertyKey key, ClassProperties &klass); - template - bool setProperty(JSVal value, const char *property_name, T &target); template std::tuple parseProperty(JSVal value, const char *property_name);