From 9a7b7f6af3894abfb6f15e826e33b88073d117f0 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 12 May 2016 10:15:31 -0700
Subject: [PATCH] [core] Update to geometry.hpp 0.5.0

---
 .mason                                | 2 +-
 platform/android/scripts/configure.sh | 2 +-
 platform/ios/scripts/configure.sh     | 2 +-
 platform/linux/scripts/configure.sh   | 2 +-
 platform/node/src/node_feature.cpp    | 5 +++++
 platform/osx/scripts/configure.sh     | 2 +-
 platform/qt/scripts/configure.sh      | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.mason b/.mason
index 742e3e406..c03b19241 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit 742e3e406ef4836db37c5616add091821763ac08
+Subproject commit c03b19241ad6450dab16bf06466f849cb5a15757
diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh
index c97bbc613..93d9c301d 100644
--- a/platform/android/scripts/configure.sh
+++ b/platform/android/scripts/configure.sh
@@ -8,7 +8,7 @@ SQLITE_VERSION=3.9.1
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=0.11.2
-GEOMETRY_VERSION=0.3.0
+GEOMETRY_VERSION=0.5.0
 GEOJSONVT_VERSION=4.1.2
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh
index d0e334769..3a63f649a 100644
--- a/platform/ios/scripts/configure.sh
+++ b/platform/ios/scripts/configure.sh
@@ -4,7 +4,7 @@ PROTOZERO_VERSION=1.3.0
 BOOST_VERSION=1.60.0
 SQLITE_VERSION=system
 ZLIB_VERSION=system
-GEOMETRY_VERSION=0.3.0
+GEOMETRY_VERSION=0.5.0
 GEOJSONVT_VERSION=4.1.2
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh
index e14556385..a578b25d9 100644
--- a/platform/linux/scripts/configure.sh
+++ b/platform/linux/scripts/configure.sh
@@ -11,7 +11,7 @@ SQLITE_VERSION=3.9.1
 LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
-GEOMETRY_VERSION=0.3.0
+GEOMETRY_VERSION=0.5.0
 GEOJSONVT_VERSION=4.1.2${CXX11ABI:-}
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
diff --git a/platform/node/src/node_feature.cpp b/platform/node/src/node_feature.cpp
index eb4b48bf3..7175f9d1f 100644
--- a/platform/node/src/node_feature.cpp
+++ b/platform/node/src/node_feature.cpp
@@ -76,6 +76,11 @@ public:
 };
 
 struct ToValue {
+    v8::Local<v8::Value> operator()(std::nullptr_t) {
+        Nan::EscapableHandleScope scope;
+        return scope.Escape(Nan::Null());
+    }
+
     v8::Local<v8::Value> operator()(bool t) {
         Nan::EscapableHandleScope scope;
         return scope.Escape(Nan::New(t));
diff --git a/platform/osx/scripts/configure.sh b/platform/osx/scripts/configure.sh
index 45a451e0d..f009bae4f 100644
--- a/platform/osx/scripts/configure.sh
+++ b/platform/osx/scripts/configure.sh
@@ -7,7 +7,7 @@ GLFW_VERSION=3.1.2
 SQLITE_VERSION=3.9.1
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
-GEOMETRY_VERSION=0.3.0
+GEOMETRY_VERSION=0.5.0
 GEOJSONVT_VERSION=4.1.2
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh
index 72c25362b..43e91cb7c 100644
--- a/platform/qt/scripts/configure.sh
+++ b/platform/qt/scripts/configure.sh
@@ -2,7 +2,7 @@
 
 PROTOZERO_VERSION=1.3.0
 BOOST_VERSION=1.60.0
-GEOMETRY_VERSION=0.3.0
+GEOMETRY_VERSION=0.5.0
 GEOJSONVT_VERSION=4.1.2${CXX11ABI:-}
 GTEST_VERSION=1.7.0${CXX11ABI:-}
 LIBJPEG_TURBO_VERSION=1.4.2