diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-22 12:31:49 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-24 09:39:15 -0700 |
| commit | 089c4e413fbe80711ebd874520d3b8fdcb997112 (patch) | |
| tree | a8088b0ed6cbd36b5cadf247a6e0fc524b6c3a3d /test | |
| parent | cb6a519f7c1e59b584b84039ebf4803c1d7eee71 (diff) | |
| download | qtlocation-mapboxgl-089c4e413fbe80711ebd874520d3b8fdcb997112.tar.gz | |
[core] Split up and clean up conversion.hpp
Diffstat (limited to 'test')
| -rw-r--r-- | test/style/filter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/style/filter.cpp b/test/style/filter.cpp index fd763896a6..2d26a8eb61 100644 --- a/test/style/filter.cpp +++ b/test/style/filter.cpp @@ -4,6 +4,7 @@ #include <mbgl/style/filter_evaluator.hpp> #include <mbgl/style/rapidjson_conversion.hpp> #include <mbgl/style/conversion.hpp> +#include <mbgl/style/conversion/filter.hpp> #include <rapidjson/document.h> @@ -17,7 +18,7 @@ typedef std::multimap<std::string, mbgl::Value> Properties; Filter parse(const char * expression) { rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc; doc.Parse<0>(expression); - return conversion::convertFilter(doc).get<Filter>(); + return *conversion::convert<Filter>(doc); } bool evaluate(const Filter& filter, const Properties& properties, FeatureType type = FeatureType::Unknown) { |