From 7f8cd2b19656750b4eb6e5fa3c8511f0a0a87327 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Mon, 29 Jun 2015 15:17:17 +0100
Subject: [PATCH] Use GCC 5.

Since it's got full C++11 support.
---
 .travis.yml    | 5 +++++
 CMakeLists.txt | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 82e0cac9..e293e2bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
   apt:
     sources:
       - boost-latest
+      - ubuntu-toolchain-r-test
     packages:
       - libboost-log1.55-dev
       - libboost-date-time1.55-dev
@@ -19,8 +20,12 @@ addons:
       - libboost-locale1.55-dev
       - libboost-iostreams1.55-dev
       - libssl-dev
+      - gcc-5
+      - g++-5
 
 install:
+  # Use GCC 5.
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
   # Currently inside the cloned repo path.
   # Install Alphanum
   - cd ../..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e6e42bc..5e70ddf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,8 +188,8 @@ ENDIF ()
 
 # GCC and MinGW settings.
 IF (CMAKE_COMPILER_IS_GNUCXX)
-    set (CMAKE_C_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++0x")
-    set (CMAKE_CXX_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++0x")
+    set (CMAKE_C_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++11")
+    set (CMAKE_CXX_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++11")
     IF (PROJECT_STATIC_RUNTIME)
         set (CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
         set (CMAKE_SHARED_LINKER_FLAGS "-static-libstdc++ -static-libgcc")