diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-20 15:44:04 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-20 15:44:04 +0100 |
| commit | 7a7f6db56d3a136c765558ace03eda3845d9f3a3 (patch) | |
| tree | 52fef29a30059993be59ee57f7a6f6aec2ca2ed4 | |
| parent | 54406e2ff1e39a3245d04253648153d5f4751938 (diff) | |
| download | ATCD-7a7f6db56d3a136c765558ace03eda3845d9f3a3.tar.gz | |
ACE/TAO now require C++14 or newer
* ACE/NEWS:
* ACE/ace/Global_Macros.h:
* ACE/ace/config-win32-msvc-141.h:
* ACE/examples/Logger/Acceptor-server/server_loggerd.cpp:
* ACE/include/makeinclude/platform_linux_clang.GNU:
* ACE/include/makeinclude/platform_macosx_common.GNU:
| -rw-r--r-- | ACE/NEWS | 2 | ||||
| -rw-r--r-- | ACE/ace/Global_Macros.h | 4 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-141.h | 3 | ||||
| -rw-r--r-- | ACE/examples/Logger/Acceptor-server/server_loggerd.cpp | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_clang.GNU | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_common.GNU | 2 |
6 files changed, 12 insertions, 4 deletions
@@ -4,6 +4,8 @@ USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 . Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, Pharlap, and Solaris +. ACE/TAO now require C++14 or newer + USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11 ====================================================== diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index bc9b20a4962..e43b1002dd4 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -57,8 +57,8 @@ # define ACE_SET_BITS(WORD, BITS) (WORD |= (BITS)) # define ACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS)) -#if !defined (ACE_HAS_CPP11) -# error ACE/TAO require C++11 compliance, please upgrade your compiler and/or fix the platform configuration for your environment +#if !defined (ACE_HAS_CPP14) +# error ACE/TAO require C++14 compliance, please upgrade your compiler and/or fix the platform configuration for your environment #endif /* !ACE_HAS_CPP11 */ #define ACE_UNIMPLEMENTED_FUNC(f) f = delete; diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index c6376395d13..8c3c201631b 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -23,6 +23,9 @@ # define ACE_WIN32_VC141 #endif +// Visual Studio 2017 has adequate C++14 support +#define ACE_HAS_CPP14 + #include "ace/config-win32-msvc-14.h" #if _MSVC_LANG >= 201402L diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp index ba53e2b3af6..dc3a2af3b01 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -260,7 +260,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } -//typedef ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t> ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Reactor, ACE_Null_Mutex); ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); #define ACE_Test_and_Set_type \ diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 2cfc0accbec..1bc22c06a02 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -45,6 +45,10 @@ ifeq ($(c++11),1) CCFLAGS += -std=c++11 endif +ifeq ($(c++14),1) + CCFLAGS += -std=c++14 +endif + ifeq ($(no_deprecated),1) CCFLAGS += -Wno-deprecated-declarations endif diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 342883b2855..315521a7f8f 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -42,7 +42,7 @@ SOBUILD = -o $(VSHDIR)$*.dylib $< ifeq ($(findstring g++,$(CXX)),)# include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU else - c++11 ?= 1 + c++14 ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU endif |