Make code C++20 compatible #1615
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`requires` is a keyword in C++20.
Defines `LIBSOLV_SOLVABLE_PREPEND_DEP`, C++20 compatibility If defined, libsolv adds the prefix "dep_" to solvable dependencies. As a result, `requires` is renamed to `dep_requires`. Needed for C++20. `requires` is a keyword in C++20.
Include C header files behind C++. "check.h" defines the `fail(...)` macro. This conflicts with the `fail` method in "istream", "ostream", ... Caught while compiling in C++20.
jan-kolarik
merged commit 20b0724
into
rpm-software-management:dnf-4-master
3 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The code is still compiled as C++11. But with this PR can also be compiled as C++14, C++17 and C++20.
Rename local variable
requirestodep_requires.Compatibility with C++20. requires is a keyword in C++20.
Defines
LIBSOLV_SOLVABLE_PREPEND_DEP.If defined, libsolv adds the prefix "dep_" to solvable dependencies. As a result,
requiresis renamed todep_requires.Needed for C++20.
requiresis a keyword in C++20.ModulePackage::createDependencies: Add "const" to std::accumulate operator
Change order of including header files in hawkey tests.
Include C header files behind C++. "check.h" defines the
fail(...)macro. This conflicts with thefailmethod in "istream", "ostream", ...Caught while compiling in C++20.