summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2018-08-06 13:13:43 +0200
committerGitHub <noreply@github.com>2018-08-06 13:13:43 +0200
commitae3cee721637d0481cdec3c52e1b379eb65a55c0 (patch)
treede428b3dc3debf4898b61d98e96c4cabd70efddf
parent2103902aeee31d66e515ee7d885acb445e0161ad (diff)
parent1cc8fd38cd74c92035478504088aaf6e9fff533f (diff)
downloadATCD-ae3cee721637d0481cdec3c52e1b379eb65a55c0.tar.gz
Merge pull request #660 from jwillemsen/master
Changed deprecated_declarations to no_deprecated so that we have the …
-rw-r--r--ACE/include/makeinclude/platform_linux_clang.GNU10
1 files changed, 3 insertions, 7 deletions
diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU
index c7358aa5bf0..303cc580393 100644
--- a/ACE/include/makeinclude/platform_linux_clang.GNU
+++ b/ACE/include/makeinclude/platform_linux_clang.GNU
@@ -31,19 +31,15 @@ endif
ifeq ($(c++0x),1)
CCFLAGS += -std=c++0x
- deprecated_declarations ?= 0
+ no_deprecated ?= 1
else
ifeq ($(c++11),1)
CCFLAGS += -std=c++11
- deprecated_declarations ?= 0
+ no_deprecated ?= 1
endif
endif
-# If the user doesn't set a default we default show
-# deprecated declarations
-deprecated_declarations ?= 1
-
-ifeq ($(deprecated_declarations),0)
+ifeq ($(no_deprecated),1)
CCFLAGS += -Wno-deprecated-declarations
endif