diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-05-21 09:48:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-05-21 09:48:26 +0000 |
| commit | 589122d99805a19da00d0e1fbd6291f50053e8bf (patch) | |
| tree | e7ec81161b334fd2b7fcaf7d7c55018782654491 | |
| parent | 2fc4bfdd53cd8767797214935b80bc873a67ed35 (diff) | |
| download | ATCD-589122d99805a19da00d0e1fbd6291f50053e8bf.tar.gz | |
Wed May 21 09:49:45 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_g++_common.GNU:
Added support for c++11 and c++1y as settings
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2851f90dbe8..73946733742 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed May 21 09:49:45 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_g++_common.GNU: + Added support for c++11 and c++1y as settings + Tue May 6 09:25:03 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * tests/run_test.lst: diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index 60f11034186..c6c2f68f06a 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -59,9 +59,16 @@ ifeq ($(gprof),1) LDFLAGS += -pg endif -ifeq ($(c++0x),1) +ifeq ($(c++1y),1) + CCFLAGS += -std=c++1y + # This is needed due to the use of the deprecated auto_ptr class + CCFLAGS += -Wno-deprecated +else ifeq ($(c++11),1) + CCFLAGS += -std=c++11 + # This is needed due to the use of the deprecated auto_ptr class + CCFLAGS += -Wno-deprecated +else 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 |