diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-04-12 11:26:10 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-04-12 11:26:10 +0000 |
| commit | 305b1184d852ad57d2e7172e66f40d9d04029bb0 (patch) | |
| tree | 968a142984cf4d783ea63fb26673d5e5bcd3ca92 | |
| parent | 30267e021322ce44d064cc6bdd3c4dfdcc04ce02 (diff) | |
| download | ATCD-305b1184d852ad57d2e7172e66f40d9d04029bb0.tar.gz | |
Thu Apr 12 11:25:25 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_linux_icc.GNU:
Added support for c++0x
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_icc.GNU | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3df69239343..e5e0aecb26a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,10 +1,15 @@ +Thu Apr 12 11:25:25 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_linux_icc.GNU: + Added support for c++0x + Tue Apr 10 20:09:23 UTC 2012 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Dev_Poll_Reactor.cpp (ACE_Dev_Poll_Reactor::resumable_handler): Changed this method to return 1 instead of 0. Thanks to David Simmonds <david dot simmonds at iggroup dot com> for providing this fix. This fixes bugid 4015. - + Added David to the ACE hall of fame. Tue Apr 10 20:10:06 UTC 2012 Adam Mitz <mitza@ociweb.com> diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU index e430f2052c2..f08a294ea81 100644 --- a/ACE/include/makeinclude/platform_linux_icc.GNU +++ b/ACE/include/makeinclude/platform_linux_icc.GNU @@ -40,7 +40,6 @@ ifeq (11.0,$(findstring 11.0,$(CXX_VERSION))) CFLAGS += -wd1684 endif ifeq (12.0,$(findstring 12.0,$(CXX_VERSION))) - CPPFLAGS += -std=c++0x no_hidden_visibility ?= 0 endif @@ -58,6 +57,9 @@ ifeq ($(ipo),1) CPPFLAGS += -ipo endif +ifeq ($(c++0x),1) + CCFLAGS += -std=c++0x +endif CFLAGS += -w1 ifeq ($(threads),1) |