upgrade to variant 1.1.4

mapbox · Nov 25, 2016 · e3acceb · e3acceb
1 parent a1d32e3
commit e3acceb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.mason b/.mason
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ matrix:
       before_script:
         - git submodule update --init
         - .mason/mason install clang 3.8.0
-        - .mason/mason install variant 1.1.0
+        - .mason/mason install variant 1.1.4
         - export PATH=`.mason/mason prefix clang 3.8.0`/bin:$PATH
     - os: osx
       osx_image: xcode7.3

diff --git a/Makefile b/Makefile
@@ -1,16 +1,18 @@
 CXXFLAGS += -I include --std=c++14 -Wall -Wextra -Werror
 MASON ?= .mason/mason
 
+VARIANT = 1.1.4
+
 default: test
 
 $(MASON):
 	git submodule update --init
 
-mason_packages: $(MASON)
-	$(MASON) install variant 1.1.0
+mason_packages/headers/variant/$(VARIANT):
+	$(MASON) install variant $(VARIANT)
 
-test: tests/* include/mapbox/geometry/* mason_packages Makefile
-	$(CXX) tests/*.cpp $(CXXFLAGS) `$(MASON) cflags variant 1.1.0` -o test
+test: tests/* include/mapbox/geometry/* mason_packages/headers/variant/$(VARIANT) Makefile
+	$(CXX) tests/*.cpp $(CXXFLAGS) `$(MASON) cflags variant $(VARIANT)` -o test
 	./test
 
 clean:

diff --git a/tests/test.cpp b/tests/test.cpp
@@ -155,10 +155,9 @@ static void testFeature() {
     assert(p["null"].is<null_value_t>());
     assert(p["null"] == null_value);
 
-    p["null"] = nullptr;
+    p["null"] = null_value_t{};
     assert(p["null"].is<null_value_t>());
     assert(p["null"] == null_value);
-    assert(p["null"] == nullptr);
 
     assert(p == p);
     assert(!(p != p));
@@ -169,10 +168,10 @@ static void testFeature() {
     assert(p.size() == 6);
 
     feature<double> id1 { point<double>() };
-    id1.id = { 1 };
+    id1.id = { uint64_t(1) };
 
     feature<double> id2 { point<double>() };
-    id1.id = { 2 };
+    id1.id = { uint64_t(2) };
 
     assert(id1 == id1);
     assert(id1 != id2);