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/value.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/value.hpp')
| -rw-r--r-- | src/mbgl/style/value.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/value.hpp b/src/mbgl/style/value.hpp index 0f3127e4f9..fd85ee36c4 100644 --- a/src/mbgl/style/value.hpp +++ b/src/mbgl/style/value.hpp @@ -2,7 +2,7 @@ #define MBGL_STYLE_VALUE #include <mapbox/variant.hpp> -#include <rapidjson/document.h> +#include <mbgl/util/rapidjson.hpp> #include <cstdlib> #include <cerrno> @@ -13,7 +13,7 @@ typedef mapbox::util::variant<bool, int64_t, uint64_t, double, std::string> Valu std::string toString(const Value &value); -Value parseValue(const rapidjson::Value&); +Value parseValue(const JSValue&); namespace util { inline bool parseNumericString(const std::string &str, double &result) { |