From 2acac617fcf27b49a9396e9c040c8b4b437529f1 Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Tue, 24 May 2016 21:37:12 +0200 Subject: [PATCH] Revert to c++98 --- CMakeLists.txt | 6 +++--- simgear/package/untar.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f6a84d0..ff0586a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,14 +22,14 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7) # only relevant for building shared libs but let's set it regardless set(CMAKE_OSX_RPATH 1) -# Set the C++ standard to C++11 to avoid compilation errors on GCC 6 (which +# Set the C++ standard to C++98 to avoid compilation errors on GCC 6 (which # defaults to C++14). if(CMAKE_VERSION VERSION_LESS "3.1") if(CMAKE_COMPILER_IS_GNUCXX) - set (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") + set (CMAKE_CXX_FLAGS "-std=gnu++98 ${CMAKE_CXX_FLAGS}") endif() else() - set (CMAKE_CXX_STANDARD 11) + set (CMAKE_CXX_STANDARD 98) endif() project(SimGear) diff --git a/simgear/package/untar.cxx b/simgear/package/untar.cxx index 1ae4f08d..ee8b7178 100644 --- a/simgear/package/untar.cxx +++ b/simgear/package/untar.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -246,7 +246,7 @@ public: } // reject absolute paths - if (p.front() == '/') { + if (p.at(0) == '/') { return false; } -- 2.39.5