From 4fe071b518e792fdf069eb81ac326cf0f27f5e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 25 Nov 2016 16:19:07 +0100
Subject: [build] upgrade to variant 1.1.4 and dependencies

---
 test/style/conversion/geojson_options.test.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/style/conversion')

diff --git a/test/style/conversion/geojson_options.test.cpp b/test/style/conversion/geojson_options.test.cpp
index dc9be237a8..14a7adbba7 100644
--- a/test/style/conversion/geojson_options.test.cpp
+++ b/test/style/conversion/geojson_options.test.cpp
@@ -17,7 +17,7 @@ TEST(GeoJSONOptions, Basic) {
 }
 
 TEST(GeoJSONOptions, ErrorHandling) {
-    ValueMap map {{"maxzoom", "should not be a string"}};
+    ValueMap map {{"maxzoom", std::string{"should not be a string"}}};
     Value raw(map);
     Result<GeoJSONOptions> converted = convert<GeoJSONOptions>(raw);
     ASSERT_FALSE((bool) converted);
@@ -44,14 +44,14 @@ TEST(GeoJSONOptions, RetainsDefaults) {
 TEST(GeoJSONOptions, FullConversion) {
     ValueMap map {
         //GeoJSON-VT
-        {"maxzoom", 1},
-        {"buffer", 2},
-        {"tolerance", 3},
+        {"maxzoom", 1.0f},
+        {"buffer", 2.0f},
+        {"tolerance", 3.0f},
         
         //Supercluster
         {"cluster", true},
-        {"clusterRadius", 4},
-        {"clusterMaxZoom", 5}
+        {"clusterRadius", 4.0f},
+        {"clusterMaxZoom", 5.0f}
     };
     Value raw(map);
     GeoJSONOptions converted = *convert<GeoJSONOptions>(raw);
-- 
cgit v1.2.1