From 12f78fc8747332a3d54763c9b0cc2e794eefb4f8 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 16 Oct 2017 15:40:07 -0700
Subject: [core] Use convertJSON instead of RapidJSON directly

---
 benchmark/parse/filter.benchmark.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'benchmark/parse')

diff --git a/benchmark/parse/filter.benchmark.cpp b/benchmark/parse/filter.benchmark.cpp
index d650cb72c9..4984668400 100644
--- a/benchmark/parse/filter.benchmark.cpp
+++ b/benchmark/parse/filter.benchmark.cpp
@@ -2,20 +2,16 @@
 
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/filter_evaluator.hpp>
-#include <mbgl/style/rapidjson_conversion.hpp>
 #include <mbgl/style/conversion.hpp>
+#include <mbgl/style/conversion/json.hpp>
 #include <mbgl/style/conversion/filter.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
 
-#include <rapidjson/document.h>
-
 using namespace mbgl;
 
 style::Filter parse(const char* expression) {
-    rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc;
-    doc.Parse<0>(expression);
     style::conversion::Error error;
-    return *style::conversion::convert<style::Filter, JSValue>(doc, error);
+    return *style::conversion::convertJSON<style::Filter>(expression, error);
 }
 
 static void Parse_Filter(benchmark::State& state) {
-- 
cgit v1.2.1