Use std::unique_ptr correctly across compiler and language versions #604
Conversation
This file contains hidden or 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
scoped_ptr has never been a part of the C++ standard - perhaps it's been confused with boost::scoped_ptr. Anyhow, std::unique_ptr is the replacement for the now-deprecated std::auto_ptr.
Previously we only used it on GCC 6 to avoid deprecated declaration warnings. Now we are proactive and use it whenever compiling as C++11 (or MSVC2010+). It also moves the logic for deciding between unique_ptr and auto_ptr into a single location in config.h. This fixes some use cases that were previously broken, including: * CXX=clang++ -std=c++11 -Werror=deprecated-declarations * CXX=g++-6 -std=c++03 -Werror=deprecated-declarations
|
If anybody objects, we might have to revert. But it looks good to me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Previously, the code tried to avoid a
-Wdeprecated-declarationswarning by avoidingstd::auto_ptr(since #413). However, the implementation has two issues:std::scoped_ptr, which as far as I can tell is a nonexistent type.std::unique_ptris presumably what was meant.auto_ptrwhenver we're using GCC6. This means we don't dodge warnings for GCC5 or clang (which also support C++11). It also means that using GCC6 in C++03 mode fails, becausestd::unique_ptrdoesn't exist there.This fixes both of these issues, using
std::unique_ptrin C++11 (and MSVC2010) and above.Tested on GCC 5.4.1, GCC 6.2.0 and Clang 5.0.0-svn300863 in both C++03 and C++11 modes.