diff options
| author | Young Hahn <young@mapbox.com> | 2016-07-06 17:29:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 17:29:34 -0400 |
| commit | 71a3b1d0db170cfc1786be88c3e7b286c50dece9 (patch) | |
| tree | 1d51cc28946dc990f8f613795417cb76ea8c00df /benchmark | |
| parent | 903d609b40b6d0f4873f7bb46d96f4a06d7b17d6 (diff) | |
| download | qtlocation-mapboxgl-71a3b1d0db170cfc1786be88c3e7b286c50dece9.tar.gz | |
[core] geometry@0.8.0 / geojsonvt@6.0.0 (#5514)
* [core] geometry.hpp 0.8.0
* geojsonvt @ 6.0.0
* Update platform deps, build scripts
* Perf optimizations/cleanup
* Rebase in geometry@080
* D.R.Y. etc
* Ensure fill annotation geometries have closed rings.
* Optimizations
* Update to geojsonvt @ 6.1.0 for clean handoff between geojson parsing and geojsonvt
* Apply close multi/poly geoms for line annotations as well
Diffstat (limited to 'benchmark')
| -rw-r--r-- | benchmark/parse/filter.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/benchmark/parse/filter.cpp b/benchmark/parse/filter.cpp index 24314e8584..6b430a9b11 100644 --- a/benchmark/parse/filter.cpp +++ b/benchmark/parse/filter.cpp @@ -9,12 +9,8 @@ #include <rapidjson/document.h> -#include <map> - using namespace mbgl; -typedef std::multimap<std::string, Value> Properties; - style::Filter parse(const char* expression) { rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc; doc.Parse<0>(expression); @@ -29,7 +25,7 @@ static void Parse_Filter(benchmark::State& state) { static void Parse_EvaluateFilter(benchmark::State& state) { const style::Filter filter = parse(R"FILTER(["==", "foo", "bar"])FILTER"); - const Properties properties = { { "foo", std::string("bar") } }; + const PropertyMap properties = { { "foo", std::string("bar") } }; while (state.KeepRunning()) { filter(FeatureType::Unknown, [&] (const std::string& key) -> optional<Value> { |