From d0a6212fd473555dc2a313d37c9abed739f1525b Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Sat, 15 Feb 2020 16:22:15 -0500
Subject: [PATCH] Remove all GCC 4.6 support; new minimum is GCC 5.4.

---
 .travis.yml     |  7 +++----
 Makefile.simple | 12 +-----------
 hyperpoint.cpp  | 10 ----------
 savemem.cpp     |  2 +-
 sysconfig.h     |  7 -------
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c38892e7..a1ca9058 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,14 @@ matrix:
         sources:
           - ubuntu-toolchain-r-test
         packages:
-          - gcc-4.6
-          - g++-4.6
+          - gcc-5
+          - g++-5
     env: >-
       TRAVIS_OS_NAME=linux
       TRAVIS_BUILD_SYSTEM=Makefile
-      HYPERROGUE_CXX=g++-4.6
+      HYPERROGUE_CXX=g++-5
       HYPERROGUE_USE_GLEW=1
       HYPERROGUE_USE_PNG=1
-      EXTRA_CXXFLAGS=-DGCC46
   - os: linux
     compiler: gcc
     env: >-
diff --git a/Makefile.simple b/Makefile.simple
index ea9bfa2f..7394943c 100644
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -33,11 +33,7 @@ else
   ifneq (,$(findstring clang,$(TOOLCHAIN_VERSION_S)))
     TOOLCHAIN := clang
   else
-    ifneq (,$(findstring 4.6.,$(TOOLCHAIN_VERSION_S)))
-      TOOLCHAIN := gcc46
-    else
-      TOOLCHAIN := gcc
-    endif
+    TOOLCHAIN := gcc
   endif
 endif
 
@@ -95,12 +91,6 @@ ifeq (${TOOLCHAIN},gcc)
   CXXFLAGS_EARLY += -Wno-unknown-warning-option -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
 endif
 
-ifeq (${TOOLCHAIN},gcc46)
-  CXXFLAGS_EARLY += -std=c++0x
-  CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
-  CXXFLAGS_EARLY += -Wno-unknown-warning-option -Wno-missing-field-initializers -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
-endif
-
 ifeq (${TOOLCHAIN},mingw)
   CXXFLAGS_EARLY += -std=c++11 -march=native
   CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
diff --git a/hyperpoint.cpp b/hyperpoint.cpp
index 9c2e8197..449162d7 100644
--- a/hyperpoint.cpp
+++ b/hyperpoint.cpp
@@ -47,21 +47,11 @@ eVariation variation;
 struct hyperpoint : array<ld, MAXMDIM> {
   hyperpoint() {}
   
-  #if ISGCC46
-  #if MAXMDIM == 4
-  // aaa
-  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> { (array<ld, MAXMDIM>) {{x, y, z, w}}} {}
-  #else
-  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> { (array<ld, MAXMDIM>) {{x, y, z}}} {}
-  #endif
-
-  #else
   #if MAXMDIM == 4
   constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> {{x,y,z,w}} {}
   #else
   constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> {{x,y,z}} {}
   #endif
-  #endif
 
   inline hyperpoint& operator *= (ld d) {
     for(int i=0; i<MDIM; i++) self[i] *= d;
diff --git a/savemem.cpp b/savemem.cpp
index f84d927a..29e9fe7e 100644
--- a/savemem.cpp
+++ b/savemem.cpp
@@ -216,7 +216,7 @@ EX void apply_memory_reserve() {
       }
     }
   catch(std::bad_alloc&) {}
-  #if (ISGCC46 || ISWINDOWS)
+  #if ISWINDOWS
   // no get_new_handler on this compiler...
   default_handler = [] { throw std::bad_alloc(); };
   #else
diff --git a/sysconfig.h b/sysconfig.h
index fe2d199e..d8e0bd8e 100644
--- a/sysconfig.h
+++ b/sysconfig.h
@@ -48,13 +48,6 @@
 #define ISSTEAM 0
 #endif
 
-#if GCC46
-#define override
-#define ISGCC46 1
-#else
-#define ISGCC46 0
-#endif
-
 #ifndef ISWEB
 #define ISWEB 0
 #endif