Revert to c++98

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f6a84d0d13e99ba1a1fdadba4c7c8c15f1a0d08..ff0586a272474e276ff967350cea3effa87f3f42 100644 (file)
--- 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 1ae4f08dfbe33ba529b407a9faf8a83c1ad46242..ee8b717806d632486f4814b668de8ab8fbc576e7 100644 (file)
--- a/simgear/package/untar.cxx
+++ b/simgear/package/untar.cxx
@@ -19,7 +19,7 @@
 
 #include <cstdlib>
 #include <cassert>
-#include <cstdint>
+#include <stdint.h>
 #include <cstring>
 #include <cstddef>
 
@@ -246,7 +246,7 @@ public:
         }
 
         // reject absolute paths
-        if (p.front() == '/') {
+        if (p.at(0) == '/') {
             return false;
         }