From 6f8b356f4acd034ff8996f515a81b789abeef715 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 4 Apr 2018 16:48:42 +0200 Subject: Only set no_deprecated to 1 when it not has been set * ACE/include/makeinclude/platform_g++_common.GNU: --- ACE/include/makeinclude/platform_g++_common.GNU | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ACE') diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index c465a3d6946..4a455c67996 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -55,27 +55,27 @@ endif ifeq ($(c++17),1) CCFLAGS += -std=c++17 # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 else ifeq ($(c++14),1) CCFLAGS += -std=c++14 # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 else ifeq ($(c++1y),1) CCFLAGS += -std=c++1y # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 else ifeq ($(c++11),1) CCFLAGS += -std=c++11 # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + 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 + no_deprecated ?= 1 endif # c++0x endif # c++11 endif # c++1y -- cgit v1.2.1