Removed support for c++11=1, we require C++14 as minimum

* ACE/include/makeinclude/platform_gcc_clang_common.GNU: * ACE/include/makeinclude/platform_linux_clang.GNU: * ACE/include/makeinclude/platform_linux_icc.GNU: * ACE/include/makeinclude/platform_qnx_gcc.GNU:
DOCGroup · Sep 15, 2023 · 0e37c17 · 0e37c17
1 parent 4e5ea53
commit 0e37c17
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU
@@ -61,10 +61,6 @@ else
   else
     ifeq ($(c++14),1)
       CCFLAGS += -std=c++14
-    else
-      ifeq ($(c++11),1)
-        CCFLAGS += -std=c++11
-      endif # c++11
     endif # c++14
   endif #c++17
 endif #c++20

diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU
@@ -35,10 +35,6 @@ ifeq ($(optimize),0)
   CPPFLAGS += -O0
 endif
 
-ifeq ($(c++11),1)
-  CCFLAGS += -std=c++11
-endif
-
 ifeq ($(c++14),1)
   CCFLAGS += -std=c++14
 endif

diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -56,10 +56,6 @@ ifeq ($(ipo),1)
   CPPFLAGS += -ipo
 endif
 
-ifeq ($(c++11),1)
-  CCFLAGS += -std=c++11
-endif
-
 CFLAGS  += -w1
 ifeq ($(threads),1)
     CPPFLAGS  += -D_REENTRANT

diff --git a/ACE/include/makeinclude/platform_qnx_gcc.GNU b/ACE/include/makeinclude/platform_qnx_gcc.GNU
@@ -34,7 +34,7 @@ SOFLAGS += $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true
 
-# Test for template  instantiation, add to SOFLAGS if SONAME set,
+# Test for template instantiation, add to SOFLAGS if SONAME set,
 # add -E to LDFLAGS if using GNU ld
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU