summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-03-06 12:48:26 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-03-09 10:31:21 -0800
commitaf75736857213ff99145769883770d4b276a644a (patch)
tree9e47f7124c9dded643fe2094bcb4e15eee350566
parent86ea1e3ac38198edadf72444a2744d7f135d01ee (diff)
downloadqtlocation-mapboxgl-af75736857213ff99145769883770d4b276a644a.tar.gz
[core] Avoid unnecessary convert template instantiations
-rw-r--r--benchmark/parse/filter.benchmark.cpp2
-rw-r--r--src/mbgl/style/tile_source_impl.cpp2
-rw-r--r--test/style/conversion/function.test.cpp2
-rw-r--r--test/style/filter.test.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/benchmark/parse/filter.benchmark.cpp b/benchmark/parse/filter.benchmark.cpp
index 5214f682d6..3918f03539 100644
--- a/benchmark/parse/filter.benchmark.cpp
+++ b/benchmark/parse/filter.benchmark.cpp
@@ -14,7 +14,7 @@ using namespace mbgl;
style::Filter parse(const char* expression) {
rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc;
doc.Parse<0>(expression);
- return *style::conversion::convert<style::Filter>(doc);
+ return *style::conversion::convert<style::Filter, JSValue>(doc);
}
static void Parse_Filter(benchmark::State& state) {
diff --git a/src/mbgl/style/tile_source_impl.cpp b/src/mbgl/style/tile_source_impl.cpp
index 7dd6ae6dbc..bda602bb5f 100644
--- a/src/mbgl/style/tile_source_impl.cpp
+++ b/src/mbgl/style/tile_source_impl.cpp
@@ -24,7 +24,7 @@ Tileset TileSourceImpl::parseTileJSON(const std::string& json, const std::string
throw std::runtime_error(message.str());
}
- conversion::Result<Tileset> result = conversion::convert<Tileset>(document);
+ conversion::Result<Tileset> result = conversion::convert<Tileset, JSValue>(document);
if (!result) {
throw std::runtime_error(result.error().message);
}
diff --git a/test/style/conversion/function.test.cpp b/test/style/conversion/function.test.cpp
index 5a3ec93917..4dc6549c78 100644
--- a/test/style/conversion/function.test.cpp
+++ b/test/style/conversion/function.test.cpp
@@ -13,7 +13,7 @@ using namespace mbgl::style::conversion;
auto parseFunction(const std::string& src) {
JSDocument doc;
doc.Parse<0>(src);
- return convert<CameraFunction<float>>(doc);
+ return convert<CameraFunction<float>, JSValue>(doc);
}
TEST(StyleConversion, Function) {
diff --git a/test/style/filter.test.cpp b/test/style/filter.test.cpp
index 33b64978f5..2f12246078 100644
--- a/test/style/filter.test.cpp
+++ b/test/style/filter.test.cpp
@@ -16,7 +16,7 @@ using namespace mbgl::style;
Filter parse(const char * expression) {
rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc;
doc.Parse<0>(expression);
- return *conversion::convert<Filter>(doc);
+ return *conversion::convert<Filter, JSValue>(doc);
}
Feature feature(const PropertyMap& properties, const Geometry<double>& geometry = Point<double>()) {