summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-09-21 08:06:42 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-09-21 08:06:42 +0000
commit20dc794452b120d450124479912c2bd8e0703521 (patch)
treedc883dfc6b8078df5793699a6120b30af8b6c84e
parent2b47340dfda4986ba815015d5edbfdcd90b2e298 (diff)
downloadATCD-20dc794452b120d450124479912c2bd8e0703521.tar.gz
Fri Sep 21 08:06:31 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_linux_icc.GNU: Use -Wno-deprecated with C++11 due to the heavy usage of auto_ptr
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/include/makeinclude/platform_linux_icc.GNU2
2 files changed, 7 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 42cd51b62f0..6f331c1fd87 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 21 08:06:31 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/platform_linux_icc.GNU:
+ Use -Wno-deprecated with C++11 due to the heavy usage of auto_ptr
+
Thu Sep 20 07:09:41 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Network_Adapters_Test.cpp:
diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
index f08a294ea81..b0c133730f3 100644
--- a/ACE/include/makeinclude/platform_linux_icc.GNU
+++ b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -59,6 +59,8 @@ 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
CFLAGS += -w1