summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-11-10 08:44:34 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-11-10 08:44:34 +0100
commit04bb26f586826c645f61c3f0a55ba70f2b78f43f (patch)
tree0a3b3026f67c732efef88c6783107536ff1f7e5c /ACE/include/makeinclude
parent32927bac2d22eca7b6d2c4bc69e54b2bfe1bdb2f (diff)
downloadATCD-04bb26f586826c645f61c3f0a55ba70f2b78f43f.tar.gz
Removed support for c++0x, use c++11
* ACE/include/makeinclude/platform_hpux_aCC.GNU: * ACE/include/makeinclude/platform_linux_icc.GNU:
Diffstat (limited to 'ACE/include/makeinclude')
-rw-r--r--ACE/include/makeinclude/platform_hpux_aCC.GNU2
-rw-r--r--ACE/include/makeinclude/platform_linux_icc.GNU6
2 files changed, 1 insertions, 7 deletions
diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU
index 49905b45c98..5a6dbea96ff 100644
--- a/ACE/include/makeinclude/platform_hpux_aCC.GNU
+++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU
@@ -206,7 +206,7 @@ ifeq ($(64bitoffsets),1)
endif
endif
-ifeq ($(c++0x),1)
+ifeq ($(c++11),1)
CCFLAGS += -Ax
endif
diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
index 25df9607f40..ee8f728b21e 100644
--- a/ACE/include/makeinclude/platform_linux_icc.GNU
+++ b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -56,12 +56,6 @@ ifeq ($(ipo),1)
CPPFLAGS += -ipo
endif
-ifeq ($(c++0x),1)
- CCFLAGS += -std=c++0x
- # This is needed due to the use of the deprecated auto_ptr class
- CCFLAGS += -Wno-deprecated
-endif
-
ifeq ($(c++11),1)
CCFLAGS += -std=c++11
# This is needed due to the use of the deprecated auto_ptr class