diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-01 13:40:20 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-01 13:40:20 +0100 |
| commit | 7d682eda67fe0c2bda0652958c16552129dc148d (patch) | |
| tree | 6eea184bd61c89f6e038682f0396f6949aafc7c5 /ACE/include | |
| parent | abefe0950093510c7fb9759e4d09ae58d992fc0d (diff) | |
| parent | 84204e8cbff7a30f2ad40534e0761b466f984438 (diff) | |
| download | ATCD-7d682eda67fe0c2bda0652958c16552129dc148d.tar.gz | |
Merge branch 'master' into jwi-valgrind
Diffstat (limited to 'ACE/include')
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 8 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_clang.GNU | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index f635763de77..fb58a60cb24 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -93,23 +93,15 @@ endif 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++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++14),1) CCFLAGS += -std=c++14 - # This is needed due to the use of the deprecated auto_ptr class - 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 endif # c++11 endif # c++14 endif #c++17 diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 298670d05b6..f5d4da11398 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -43,7 +43,6 @@ endif ifeq ($(c++11),1) CCFLAGS += -std=c++11 - no_deprecated ?= 1 endif ifeq ($(no_deprecated),1) |