upgrade mason

try clang++ mason package
Revert "inherit ctor's from geometry_base"
2016-07-28 20:51:02 -07:00 · 2016-07-28 18:38:34 -07:00 · 2016-07-28 16:03:57 -07:00
3 changed files with 9 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -80,10 +80,10 @@ before_script:
 - source bootstrap.sh
 - |
   if [[ $(uname -s) == 'Linux' ]]; then
-     mason install clang 3.8.0
-     export PATH=$(mason prefix clang 3.8.0)/bin:${PATH}
+     mason install clang++ 3.8.0
+     export PATH=$(mason prefix clang++ 3.8.0)/bin:${PATH}
     which clang++
-     export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov"
+     export LLVM_COV="$(mason prefix clang++ 3.8.0)/bin/llvm-cov"
   fi
 - ccache --version
 - ccache -p || true
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -10,7 +10,7 @@ todo
 - shrink icu data
 '

-MASON_VERSION="b709931"
+MASON_VERSION="a78276f"

 function setup_mason() {
    if [[ ! -d ./.mason ]]; then
--- a/include/mapnik/geometry.hpp
+++ b/include/mapnik/geometry.hpp
@ -148,7 +148,11 @@ struct geometry : geometry_base<T>

    geometry()
        : geometry_base<T>() {} // empty
-    using geometry_base<T>::geometry_base;
+
+    template <typename G>
+    geometry(G && geom)
+        : geometry_base<T>(std::forward<G>(geom)) {}
+
 };

 template <typename T>
Author	SHA1	Message	Date
Dane Springmeyer	b9924d68a5	upgrade mason	2016-07-28 20:51:02 -07:00
Dane Springmeyer	2523bb3b1c	try clang++ mason package	2016-07-28 18:38:34 -07:00
Dane Springmeyer	4917037fdd	Revert "inherit ctor's from geometry_base" This reverts commit `bf99177da7`.	2016-07-28 16:03:57 -07:00