Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for c++std in platform_macros.GNU #2127

Merged
merged 1 commit into from
Sep 15, 2023
Merged

Add support for c++std in platform_macros.GNU #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ACE/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
====================================================

Expand Down
4 changes: 4 additions & 0 deletions ACE/include/makeinclude/platform_gcc_clang_common.GNU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading