diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 63ca1ef7865c2..66f116a7f6189 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -48,19 +48,19 @@ jobs: - CC: gcc-11 CXX: g++-11 PackageDeps: g++-11 - optional_macros: CCFLAGS+=-std=c++20 + optional_macros: c++std=c++20 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU os: ubuntu-22.04 - CC: gcc-12 CXX: g++-12 PackageDeps: g++-12 - optional_macros: CCFLAGS+=-std=c++20 + optional_macros: c++std=c++20 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU os: ubuntu-22.04 - CC: gcc-13 CXX: g++-13 PackageDeps: g++-13 - optional_macros: CCFLAGS+=-std=c++20 + optional_macros: c++std=c++20 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU os: ubuntu-22.04 - CC: clang-6.0 diff --git a/ACE/NEWS b/ACE/NEWS index d5cbee617598f..b42d6906b4ee4 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -7,6 +7,9 @@ USER VISIBLE CHANGES BETWEEN ACE-7.1.1 and ACE-7.1.2 ACE_Auto_Basic_Ptr, ACE_Auto_Basic_Array_Ptr, ACE_Auto_Array_Ptr, and ACE_auto_ptr_reset anymore, just use std::unique_ptr +. Add c++std which can be used in the platform_macros.GNU + to set the C++ revision to be used (results in -std= flag) + USER VISIBLE CHANGES BETWEEN ACE-7.1.0 and ACE-7.1.1 ==================================================== diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU index a808d0246c4d7..6827c9ebe63c9 100644 --- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU +++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU @@ -53,6 +53,10 @@ else CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 endif # shared_libs +ifneq ($(c++std),) + CCFLAGS += -std=$(c++std) +endif + ifeq ($(c++20),1) CCFLAGS += -std=c++20 else