boostorg/optional
1
0
Fork 1
mirror of https://github.com/boostorg/optional.git synced 2025-07-29 20:17:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Kojoley-remove-deprecation-mark-from-reset' into develop

Browse Source
This commit is contained in:
Andrzej Krzemienski
2018-10-23 22:35:55 +02:00
parent 106f9aee5e bebc606a4c
commit 59277bc31f
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/27_ref_optional_synopsis.qbk
View File

@ -196,11 +196,10 @@ They are empty, trivially copyable classes with disabled default constructor.
bool operator!() const noexcept ; ``[link reference_optional_operator_not __GO_TO__]``
// deprecated methods
// (deprecated)
void reset() noexcept ; ``[link reference_optional_reset __GO_TO__]``
// deprecated methods
// (deprecated)
void reset ( T const& ) ; ``[link reference_optional_reset_value __GO_TO__]``
@ -275,11 +274,10 @@ They are empty, trivially copyable classes with disabled default constructor.
bool operator!() const noexcept ; ``[link reference_optional_ref_operator_not __GO_TO__]``
// deprecated methods
// (deprecated)
void reset() noexcept ; ``[link reference_optional_ref_reset __GO_TO__]``
// deprecated methods
// (deprecated)
template<class R> void reset ( R && r ) noexcept ; ``[link reference_optional_ref_reset_value __GO_TO__]``

5
doc/28_ref_optional_semantics.qbk
View File

@ -541,7 +541,7 @@ __SPACE__
[#reference_optional_reset]
[: `void optional<T>::reset() noexcept ;`]
* [*Deprecated:] Same as `operator=( none_t );`
* [*Effects:] Same as `operator=( none_t );`
__SPACE__
@ -1129,8 +1129,7 @@ __SPACE__
[#reference_optional_ref_reset]
[: `void optional<T&>::reset() noexcept;`]
* [*Effects:] Use `*this = none` instead.
* [*Remarks:] This function is depprecated.
* [*Effects:] Same as `*this = none`.
__SPACE__

4
doc/91_relnotes.qbk
View File

@ -11,6 +11,10 @@
[section:relnotes Release Notes]
[heading Boost Release 1.69]
* Remove deprecation mark from `reset()` method (without arguments).
[heading Boost Release 1.68]
* Added member function `has_value()` for compatibility with `std::optional` ([@https://github.com/boostorg/optional/issues/52 issue #52]).

2
include/boost/optional/detail/old_optional_implementation.hpp
View File

@ -332,7 +332,7 @@ class optional_base : public optional_tag
public :
// **DEPPRECATED** Destroys the current value, if any, leaving this UNINITIALIZED
// Destroys the current value, if any, leaving this UNINITIALIZED
// No-throw (assuming T::~T() doesn't)
void reset() BOOST_NOEXCEPT { destroy(); }

2
include/boost/optional/detail/optional_trivially_copyable_base.hpp
View File

@ -127,7 +127,7 @@ class tc_optional_base : public optional_tag
public :
// **DEPPRECATED** Destroys the current value, if any, leaving this UNINITIALIZED
// Destroys the current value, if any, leaving this UNINITIALIZED
// No-throw (assuming T::~T() doesn't)
void reset() BOOST_NOEXCEPT { destroy(); }

2
include/boost/optional/optional.hpp
View File

@ -378,7 +378,7 @@ class optional_base : public optional_tag
public :
// **DEPPRECATED** Destroys the current value, if any, leaving this UNINITIALIZED
// Destroys the current value, if any, leaving this UNINITIALIZED
// No-throw (assuming T::~T() doesn't)
void reset() BOOST_NOEXCEPT { destroy(); }