diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2015-12-14 16:07:15 -0800 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2015-12-14 16:43:35 -0800 |
commit | 95cef66e229f3ae346a66ea87f95a8a660c3108f (patch) | |
tree | 55a571023c47fb893314dbc98bc7d4cc6cca6273 /src/mbgl/style/layout_property.hpp | |
parent | 9b8f5d3be1d25a0eefe7f9f22544d439f54d92b1 (diff) | |
download | qtlocation-mapboxgl-95cef66e229f3ae346a66ea87f95a8a660c3108f.tar.gz |
[core] change RapidJSON usage to use CrtAllocator and bump GeoJSON VT
Diffstat (limited to 'src/mbgl/style/layout_property.hpp')
-rw-r--r-- | src/mbgl/style/layout_property.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/style/layout_property.hpp b/src/mbgl/style/layout_property.hpp index 65ce06a153..e27bab3af2 100644 --- a/src/mbgl/style/layout_property.hpp +++ b/src/mbgl/style/layout_property.hpp @@ -3,20 +3,18 @@ #include <mbgl/style/property_parsing.hpp> #include <mbgl/style/function.hpp> -#include <utility> +#include <mbgl/util/rapidjson.hpp> -#include <rapidjson/document.h> +#include <utility> namespace mbgl { -using JSVal = rapidjson::Value; - template <typename T> class LayoutProperty { public: explicit LayoutProperty(T v) : value(std::move(v)) {} - void parse(const char * name, const JSVal& layout) { + void parse(const char * name, const JSValue& layout) { if (layout.HasMember(name)) { parsedValue = parseProperty<Function<T>>(name, layout[name]); } |