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/property_parsing.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/property_parsing.hpp')
| -rw-r--r-- | src/mbgl/style/property_parsing.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/style/property_parsing.hpp b/src/mbgl/style/property_parsing.hpp index d287468e79..8df95e1d66 100644 --- a/src/mbgl/style/property_parsing.hpp +++ b/src/mbgl/style/property_parsing.hpp @@ -3,20 +3,19 @@ #include <mbgl/style/types.hpp> +#include <mbgl/util/rapidjson.hpp> + #include <mapbox/optional.hpp> -#include <rapidjson/document.h> #include <functional> namespace mbgl { -using JSVal = rapidjson::Value; - template <typename T> using optional = mapbox::util::optional<T>; template <typename T> -optional<T> parseProperty(const char* name, const JSVal&); +optional<T> parseProperty(const char* name, const JSValue&); } // namespace mbgl |