feedc0de/boost_optional
1
0
Fork 0
forked from boostorg/optional
Code Pull Requests Activity

fix for the previous partial commit

Browse Source
This commit is contained in:
Andrzej Krzemienski
2017-11-06 21:55:54 +01:00
parent 7541076cf1
commit f9fdf42a17
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -940,7 +940,7 @@ class optional
// Creates a deep copy of another optional<T> // Creates a deep copy of another optional<T>
// Can throw if T::T(T const&) does // Can throw if T::T(T const&) does
#ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_FUNCTIONS #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
optional ( optional const& ) = default; optional ( optional const& ) = default;
#else #else
optional ( optional const& rhs ) : base( static_cast<base const&>(rhs) ) {} optional ( optional const& rhs ) : base( static_cast<base const&>(rhs) ) {}
@ -950,7 +950,7 @@ class optional
// Creates a deep move of another optional<T> // Creates a deep move of another optional<T>
// Can throw if T::T(T&&) does // Can throw if T::T(T&&) does
#ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_FUNCTIONS #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
optional ( optional && rhs ) = default; optional ( optional && rhs ) = default;
#else #else
optional ( optional && rhs ) optional ( optional && rhs )
@ -1015,7 +1015,7 @@ class optional
// Assigns from another optional<T> (deep-copies the rhs value) // Assigns from another optional<T> (deep-copies the rhs value)
// Basic Guarantee: If T::T( T const& ) throws, this is left UNINITIALIZED // Basic Guarantee: If T::T( T const& ) throws, this is left UNINITIALIZED
// (NOTE: On BCB, this operator is not actually called and left is left UNMODIFIED in case of a throw) // (NOTE: On BCB, this operator is not actually called and left is left UNMODIFIED in case of a throw)
#ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_FUNCTIONS #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
optional& operator= ( optional const& rhs ) = default; optional& operator= ( optional const& rhs ) = default;
#else #else
optional& operator= ( optional const& rhs ) optional& operator= ( optional const& rhs )
@ -1027,7 +1027,7 @@ class optional
#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
// Assigns from another optional<T> (deep-moves the rhs value) // Assigns from another optional<T> (deep-moves the rhs value)
#ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_FUNCTIONS #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
optional& operator= ( optional && ) = default; optional& operator= ( optional && ) = default;
#else #else
optional& operator= ( optional && rhs ) optional& operator= ( optional && rhs )