diff --git a/doc/27_ref_optional_synopsis.qbk b/doc/27_ref_optional_synopsis.qbk index 7114b43..bcd18e8 100644 --- a/doc/27_ref_optional_synopsis.qbk +++ b/doc/27_ref_optional_synopsis.qbk @@ -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 void reset ( R && r ) noexcept ; ``[link reference_optional_ref_reset_value __GO_TO__]`` diff --git a/doc/28_ref_optional_semantics.qbk b/doc/28_ref_optional_semantics.qbk index 6ce0d2e..2fa7500 100644 --- a/doc/28_ref_optional_semantics.qbk +++ b/doc/28_ref_optional_semantics.qbk @@ -541,7 +541,7 @@ __SPACE__ [#reference_optional_reset] [: `void optional::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::reset() noexcept;`] -* [*Effects:] Use `*this = none` instead. -* [*Remarks:] This function is depprecated. +* [*Effects:] Same as `*this = none`. __SPACE__ diff --git a/doc/91_relnotes.qbk b/doc/91_relnotes.qbk index b7d410f..92648d0 100644 --- a/doc/91_relnotes.qbk +++ b/doc/91_relnotes.qbk @@ -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]). diff --git a/include/boost/optional/detail/old_optional_implementation.hpp b/include/boost/optional/detail/old_optional_implementation.hpp index b35ba8b..f8dc260 100644 --- a/include/boost/optional/detail/old_optional_implementation.hpp +++ b/include/boost/optional/detail/old_optional_implementation.hpp @@ -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(); } diff --git a/include/boost/optional/detail/optional_trivially_copyable_base.hpp b/include/boost/optional/detail/optional_trivially_copyable_base.hpp index d2e55fa..0734f62 100644 --- a/include/boost/optional/detail/optional_trivially_copyable_base.hpp +++ b/include/boost/optional/detail/optional_trivially_copyable_base.hpp @@ -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(); } diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp index 01cb2bd..104bca4 100644 --- a/include/boost/optional/optional.hpp +++ b/include/boost/optional/optional.hpp @@ -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(); }