From 878310b8912c83445ce7b12ee2b30a4489bf34f7 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 26 Apr 2016 10:36:25 -0700 Subject: [core] Simplify property parsing This is a followup to #4811. Now that use of Function is consistent, we can have a single separate parseProperty template function that delegates to a parseConstant template function. --- src/mbgl/style/paint_property.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mbgl/style/paint_property.hpp') diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index 124b0a7c0a..3c2b4ba7d7 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -51,14 +51,14 @@ public: ClassID classID = isClass ? ClassDictionary::Get().lookup(paintName.substr(6)) : ClassID::Default; if (it->value.HasMember(name)) { - auto v = parseProperty(name, it->value[name]); + auto v = parseProperty(name, it->value[name]); if (v) { values.emplace(classID, *v); } } if (it->value.HasMember(transitionName.c_str())) { - auto v = parseProperty(name, it->value[transitionName.c_str()]); + auto v = parsePropertyTransition(name, it->value[transitionName.c_str()]); if (v) { transitions.emplace(classID, *v); } -- cgit v1.2.1