<optional> requires -std=c++17 #479
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
There are now more places than just descr.h that make use of these. The new macro isn't quite the same: the old one only tested for a couple features, while the new one checks for the __cplusplus version (but doesn't even try to enable C++14 for MSVC/ICC).
g++ 7 adds <optional>, but including it in C++14 mode isn't allowed (just as including <experimental/optional> isn't allowed in C++11 mode). (This wasn't triggered in g++-6 because it doesn't provide <optional> yet.) This fixes the compilation under g++-7.
wjakob
reviewed
Nov 4, 2016
| @@ -30,7 +30,7 @@ | |||
| # define PYBIND11_NOINLINE __attribute__ ((noinline)) | |||
| #endif | |||
|
|
|||
| #if __cplusplus > 201103L | |||
| #if PYBIND11_CPP14 | |||
There was a problem hiding this comment.
Hmm -- that doesn't seem right. PYBIND11_CPP14 isn't defined until later below.
It obviously needs to be defined above the use for DEPRECATED.
|
Great, thank you! |
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.
This is a sort of continuation of #476: attempting to include in C++14 fails in just the same way (under g++-7, which actually adds it) as attempting to include <experimental/optional> under C++11.
This fixes it.
It also has a commit that generalizes the C++14/17 detection macros a bit (to look for C++14 mode instead of just the specific features descr.h needs), and moves them to
common.hinstead ofdescr.h. (Neither MSVC or ICC get these turned on as current versions of both are still quite C++14-incomplete).