tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Split up and clean up conversion.hpp

Browse Source
This commit is contained in:
John Firebaugh
2016-06-22 12:31:49 -07:00
parent cb6a519f7c
commit 089c4e413f
10 changed files with 483 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
benchmark/parse/filter.cpp
View File

@@ -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 <mbgl/tile/geometry_tile_data.hpp>
#include <rapidjson/document.h>
@@ -17,7 +18,7 @@ typedef std::multimap<std::string, Value> Properties;
style::Filter parse(const char* expression) {
rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc;
doc.Parse<0>(expression);
return style::conversion::convertFilter(doc).get<style::Filter>();
return *style::conversion::convert<style::Filter>(doc);
}
static void Parse_Filter(benchmark::State& state) {