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.

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

Changed the default to C++17 for QNX and g++ versions older as 11 (11… #2212

Merged
merged 4 commits into from
Apr 8, 2024

Conversation

jwillemsen
Copy link
Member

… has C++17 as default)

* ACE/include/makeinclude/platform_g++_common.GNU:
* ACE/include/makeinclude/platform_qnx_gcc.GNU:

… has C++17 as default)

    * ACE/include/makeinclude/platform_g++_common.GNU:
    * ACE/include/makeinclude/platform_qnx_gcc.GNU:
@jwillemsen
Copy link
Member Author

#2070

@jwillemsen jwillemsen merged commit 3c1ffaa into DOCGroup:master Apr 8, 2024
43 checks passed
@jwillemsen jwillemsen deleted the jwi-defaultcpp17 branch April 8, 2024 07:36
Comment on lines +78 to +87
ifeq ($(findstring $(CXX_MAJOR_VERSION),7),$(CXX_MAJOR_VERSION))
c++std ?= c++17
endif
ifeq ($(findstring $(CXX_MAJOR_VERSION),8),$(CXX_MAJOR_VERSION))
c++std ?= c++17
endif
ifeq ($(findstring $(CXX_MAJOR_VERSION),9),$(CXX_MAJOR_VERSION))
c++std ?= c++17
endif
ifeq ($(findstring $(CXX_MAJOR_VERSION),10),$(CXX_MAJOR_VERSION))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like this would match versions 17, 18, 19, 27, etc. If this was run with those versions it would downgrade the standard being used if the user didn't set c++std.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This matches the code we had in the past for C++11, will have a look at this before the next micro, feel free to open a PR

@@ -74,6 +74,20 @@ endif

CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)

# Minimum C++ level is now C++17, gcc until version 11 have an older version as default
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't consistent with what the title of PR is. I'm also still not sure what the purpose of changing the default from the compiler default is. Does ACE still compile with C++14?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACE master currently compiles with C++14, this is a first step towards C++17 as minimum required level. Someone has to dive into the microsoft support, when we have there C++17 as default I plan to move C++17 as minimum level

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants