Update dependencies

mapbox · Feb 7, 2017 · 957069f · 957069f
1 parent 6ff68fa
commit 957069f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.mason b/.mason
diff --git a/.travis.yml b/.travis.yml
@@ -10,13 +10,13 @@ matrix:
           sources: [ 'ubuntu-toolchain-r-test' ]
           packages: [ 'libstdc++-5-dev', 'g++-5', 'libxi-dev','libglu1-mesa-dev','x11proto-randr-dev','x11proto-xext-dev','libxrandr-dev','x11proto-xf86vidmode-dev','libxxf86vm-dev','libxcursor-dev','libxinerama-dev' ]
     - os: linux
-      env: CXX=clang++-3.8 BUILDTYPE=Debug ASAN_OPTIONS=detect_leaks=1 CXXFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address"
+      env: CXX=clang++-3.9 BUILDTYPE=Debug ASAN_OPTIONS=detect_leaks=1 CXXFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address"
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test' ]
           packages: [ 'libstdc++-5-dev', 'libxi-dev','libglu1-mesa-dev','x11proto-randr-dev','x11proto-xext-dev','libxrandr-dev','x11proto-xf86vidmode-dev','libxxf86vm-dev','libxcursor-dev','libxinerama-dev' ]
     - os: linux
-      env: CXX=clang++-3.8 BUILDTYPE=Release
+      env: CXX=clang++-3.9 BUILDTYPE=Release
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test', ]
@@ -30,8 +30,8 @@ cache: apt
 install:
   - |
     if [[ ${CXX} =~ "clang" ]] && [[ $(uname -s) == "Linux" ]]; then
-      ./.mason/mason install clang 3.8.0
-      CLANG_PREFIX=$(./.mason/mason prefix clang 3.8.0)
+      ./.mason/mason install clang++ 3.9.1
+      CLANG_PREFIX=$(./.mason/mason prefix clang++ 3.9.1)
       export PATH=${CLANG_PREFIX}/bin:${PATH}
       which clang++
       clang++ -v

diff --git a/Makefile b/Makefile
@@ -4,12 +4,12 @@ DEBUG_FLAGS ?= -g -O0 -DDEBUG
 
 MASON ?= .mason/mason
 
-VARIANT = variant 1.1.0
-GEOMETRY = geometry 0.8.0
-GEOJSON = geojson 0.1.4-cxx03abi
+VARIANT = variant 1.1.4
+GEOMETRY = geometry 0.9.0
+GEOJSON = geojson 0.4.0
 GLFW = glfw 3.1.2
-GTEST = gtest 1.7.0
-RAPIDJSON = rapidjson 1.0.2
+GTEST = gtest 1.8.0
+RAPIDJSON = rapidjson 1.1.0
 
 VARIANT_FLAGS = `$(MASON) cflags $(VARIANT)`
 GEOMETRY_FLAGS = `$(MASON) cflags $(GEOMETRY)`

diff --git a/test/test.cpp b/test/test.cpp
@@ -1,6 +1,7 @@
 #include "util.hpp"
 #include <gtest/gtest.h>
 #include <mapbox/geojson.hpp>
+#include <mapbox/geojson_impl.hpp>
 #include <mapbox/geojsonvt.hpp>
 #include <mapbox/geojsonvt/clip.hpp>
 #include <mapbox/geojsonvt/convert.hpp>

diff --git a/test/util.cpp b/test/util.cpp
@@ -99,7 +99,7 @@ parseJSONTile(const rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAll
                 const std::string tagKey{ jt->name.GetString(), jt->name.GetStringLength() };
                 switch (jt->value.GetType()) {
                 case rapidjson::kNullType:
-                    feat.properties.emplace(tagKey, nullptr);
+                    feat.properties.emplace(tagKey, mapbox::geometry::null_value);
                     break;
                 case rapidjson::kFalseType:
                     feat.properties.emplace(tagKey, false);