diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-12 10:15:31 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-13 09:01:32 -0700 |
| commit | 9a7b7f6af3894abfb6f15e826e33b88073d117f0 (patch) | |
| tree | 0533a6d664e978ebe48027bc28c6b380cc8b477c | |
| parent | cd65a43855f33555eca5f3e3ad5d37661253209f (diff) | |
| download | qtlocation-mapboxgl-9a7b7f6af3894abfb6f15e826e33b88073d117f0.tar.gz | |
[core] Update to geometry.hpp 0.5.0
| m--------- | .mason | 0 | ||||
| -rw-r--r-- | platform/android/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/ios/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/linux/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/node/src/node_feature.cpp | 5 | ||||
| -rw-r--r-- | platform/osx/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 2 |
7 files changed, 10 insertions, 5 deletions
diff --git a/.mason b/.mason -Subproject 742e3e406ef4836db37c5616add091821763ac0 +Subproject c03b19241ad6450dab16bf06466f849cb5a1575 diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh index c97bbc6136..93d9c301dd 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 d0e3347690..3a63f649a1 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 e14556385d..a578b25d9b 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 eb4b48bf35..7175f9d1fa 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 45a451e0d4..f009bae4f6 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 72c25362b4..43e91cb7c4 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 |