summaryrefslogtreecommitdiff
path: root/src/mbgl/style/paint_property.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-12-14 16:07:15 -0800
committerKonstantin Käfer <mail@kkaefer.com>2015-12-14 16:43:35 -0800
commit95cef66e229f3ae346a66ea87f95a8a660c3108f (patch)
tree55a571023c47fb893314dbc98bc7d4cc6cca6273 /src/mbgl/style/paint_property.hpp
parent9b8f5d3be1d25a0eefe7f9f22544d439f54d92b1 (diff)
downloadqtlocation-mapboxgl-95cef66e229f3ae346a66ea87f95a8a660c3108f.tar.gz
[core] change RapidJSON usage to use CrtAllocator and bump GeoJSON VT
Diffstat (limited to 'src/mbgl/style/paint_property.hpp')
-rw-r--r--src/mbgl/style/paint_property.hpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp
index 3fb0a194f0..930f12c992 100644
--- a/src/mbgl/style/paint_property.hpp
+++ b/src/mbgl/style/paint_property.hpp
@@ -9,16 +9,13 @@
#include <mbgl/style/style_calculation_parameters.hpp>
#include <mbgl/util/interpolate.hpp>
#include <mbgl/util/std.hpp>
-
-#include <rapidjson/document.h>
+#include <mbgl/util/rapidjson.hpp>
#include <map>
#include <utility>
namespace mbgl {
-using JSVal = rapidjson::Value;
-
template <typename T, typename Result = T>
class PaintProperty {
public:
@@ -34,7 +31,7 @@ public:
transitions(other.transitions) {
}
- void parse(const char* name, const JSVal& layer) {
+ void parse(const char* name, const JSValue& layer) {
mbgl::util::erase_if(values, [] (const auto& p) { return p.first != ClassID::Fallback; });
std::string transitionName = { name };