diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | gyp/common.gypi | 1 | ||||
| -rw-r--r-- | src/mbgl/util/uv_detail.hpp | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index a98045c50d..b867735101 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,23 +7,23 @@ matrix: - os: linux include: - os: linux - env: FLAVOR=linux CXX=g++-4.8 BUILDTYPE=Release + env: FLAVOR=linux CXX=g++-4.9 BUILDTYPE=Release addons: apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'gdb', 'g++-4.8', 'gcc-4.8', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] + packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: linux env: FLAVOR=linux CXX=clang++ BUILDTYPE=Debug addons: apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] + packages: [ 'gdb', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: linux env: FLAVOR=linux CXX=clang++ BUILDTYPE=Release addons: apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] + packages: [ 'gdb', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: osx env: FLAVOR=osx BUILDTYPE=Debug - os: osx @@ -5,7 +5,7 @@ implemented in C++11, currently targeting iOS, OS X, Android, and Ubuntu Linux. # Depends - - Modern C++ compiler that supports `-std=c++11` (On OS X clang++, on Linux g++-4.8 or g++-4.9) + - Modern C++ compiler that supports `-std=c++14` (On OS X clang++, on Linux g++-4.9) - [Boost headers](http://boost.org/) - [`zlib`](http://www.zlib.net/) - [`libpng`](http://www.libpng.org/pub/png/libpng.html) @@ -85,8 +85,8 @@ Install GCC 4.8+ if you are running Ubuntu 13.10 or older. Alternatively, you ca sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install gcc-4.8 g++-4.8 - export CXX=g++-4.8 + sudo apt-get install gcc-4.9 g++-4.9 + export CXX=g++-4.9 Ensure you have git and other build essentials: diff --git a/gyp/common.gypi b/gyp/common.gypi index fbfa687117..fe513643ae 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -34,7 +34,6 @@ '-Wshadow', '-Wno-variadic-macros', '-Wno-error=unused-parameter', - '-Wno-unknown-warning-option', '-frtti', '-fexceptions', ], diff --git a/src/mbgl/util/uv_detail.hpp b/src/mbgl/util/uv_detail.hpp index 059d7c0ddb..7e2c16a2a3 100644 --- a/src/mbgl/util/uv_detail.hpp +++ b/src/mbgl/util/uv_detail.hpp @@ -75,8 +75,8 @@ public: } inline ~handle() { - uv_close(t.release(), [](uv_handle_t* handle) { - delete reinterpret_cast<T*>(handle); + uv_close(t.release(), [](uv_handle_t* h) { + delete reinterpret_cast<T*>(h); }); } |