diff options
Diffstat (limited to 'ACE/include/makeinclude')
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index 4a455c67996..413fb0c0b88 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -52,18 +52,18 @@ ifeq ($(gprof),1) LDFLAGS += -pg endif -ifeq ($(c++17),1) - CCFLAGS += -std=c++17 +ifeq ($(c++20),1) + CCFLAGS += -std=c++20 # This is needed due to the use of the deprecated auto_ptr class no_deprecated ?= 1 else - ifeq ($(c++14),1) - CCFLAGS += -std=c++14 + ifeq ($(c++17),1) + CCFLAGS += -std=c++17 # This is needed due to the use of the deprecated auto_ptr class no_deprecated ?= 1 else - ifeq ($(c++1y),1) - CCFLAGS += -std=c++1y + ifeq ($(c++14),1) + CCFLAGS += -std=c++14 # This is needed due to the use of the deprecated auto_ptr class no_deprecated ?= 1 else @@ -71,16 +71,10 @@ else CCFLAGS += -std=c++11 # This is needed due to the use of the deprecated auto_ptr class no_deprecated ?= 1 - else - ifeq ($(c++0x),1) - CCFLAGS += -std=c++0x - # This is needed due to the use of the deprecated auto_ptr class - no_deprecated ?= 1 - endif # c++0x endif # c++11 - endif # c++1y - endif # c++14 -endif #c++17 + endif # c++14 + endif #c++17 +endif #c++20 ifeq ($(no_deprecated),1) CCFLAGS += -Wno-deprecated |