Removed support for gcc < 4.8

2 files changed, 18 insertions, 39 deletions

diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index fb58a60cb24..6afda33beab 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -80,11 +80,6 @@ CXX_MINOR_VERSION := $(word 2,$(subst ., ,$(CXX_VERSION)))
 else
 CXX_MINOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/^[0-9]*\.//' | sed -e 's/\..*$$//')
 endif
-ifeq ($(findstring $(CXX_MAJOR_VERSION),1 2 3),$(CXX_MAJOR_VERSION))
-GXX_4_OR_BETTER := 0
-else
-GXX_4_OR_BETTER := 1
-endif
 
 # gcc 4 has C++03 as default C++ version, enable this to be C++11
 ifeq ($(findstring $(CXX_MAJOR_VERSION),4),$(CXX_MAJOR_VERSION))
@@ -169,10 +164,8 @@ else
     # for GCC >= 4.2; these checks and the resulting warnings are very controversial and
     # popular opinion on the web seems to be that it brings little practical value and a
     # lot of pain to attempt to solve code issues and the best way to deal is to suppress
-    ifeq ($(GXX_4_OR_BETTER), 1)
-      ifneq ($(findstring $(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION),4.1),$(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION))
-        FLAGS_C_CC += -fno-strict-aliasing
-      endif
+    ifneq ($(findstring $(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION),4.1),$(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION))
+      FLAGS_C_CC += -fno-strict-aliasing
     endif
   endif
 endif
@@ -200,33 +193,27 @@ ifeq ($(shared_libs), 1)
       endif # LD_EXPORT_DEFINED = 1
     endif # GNU ld
 
-    # Take advantage of G++ (>= 4.x) visibility attributes to generate
+    # Take advantage of g++ visibility attributes to generate
     # improved shared library binaries.
-    ifeq ($(GXX_4_OR_BETTER), 1)
-      ifneq ($(no_hidden_visibility),1)
-        CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-        ifeq ($(gcc_template_instantiation_visibility),1)
-          CCFLAGS += -DACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS=1
-        endif # gcc_template_instantiation_visibility
-      else
-        CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
-      endif # no_hidden_visibility
-    endif # GXX_4_OR_BETTER == 1
+    ifneq ($(no_hidden_visibility),1)
+      CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+      ifeq ($(gcc_template_instantiation_visibility),1)
+        CCFLAGS += -DACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS=1
+      endif # gcc_template_instantiation_visibility
+    else
+      CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+    endif # no_hidden_visibility
   else
-    # Explicitly disable G++ (>= 4.x) visibility attributes since
+    # Explicitly disable g++ visibility attributes since
     # they are only meant for use when building shared libraries.
-    ifeq ($(GXX_4_OR_BETTER), 1)
-      no_hidden_visibility = 1
-      CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
-    endif # GXX_4_OR_BETTER == 1
+    no_hidden_visibility = 1
+    CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
   endif # static_libs_only
 else
-  # Explicitly disable G++ (>= 4.x) visibility attributes since
+  # Explicitly disable g++ visibility attributes since
   # they are only meant for use when building shared libraries.
-  ifeq ($(GXX_4_OR_BETTER), 1)
-    no_hidden_visibility = 1
-    CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
-  endif # GXX_4_OR_BETTER == 1
+  no_hidden_visibility = 1
+  CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
 endif # shared_libs
 
 minimaltoc ?= 0
diff --git a/ACE/include/makeinclude/platform_mingw32.GNU b/ACE/include/makeinclude/platform_mingw32.GNU
index 04b0eff8185..48f08d724e2 100644
--- a/ACE/include/makeinclude/platform_mingw32.GNU
+++ b/ACE/include/makeinclude/platform_mingw32.GNU
@@ -34,12 +34,4 @@ endif
 
 LIBS += -lwsock32 -lnetapi32
 
-ifeq ($(GXX_4_OR_BETTER),1)
-  ifeq ($(CXX_MAJOR_VERSION),4)
-    ifeq ($(findstring $(CXX_MINOR_VERSION),7 8 9),$(CXX_MINOR_VERSION))
-      CPPFLAGS += -Wno-unknown-pragmas
-    endif
-  else
-    CPPFLAGS += -Wno-unknown-pragmas
-  endif
-endif
+CPPFLAGS += -Wno-unknown-pragmas