src/cxx_supportlib/vendor-modified/boost/optional/optional.hpp in passenger-6.0.20 vs src/cxx_supportlib/vendor-modified/boost/optional/optional.hpp in passenger-6.0.23
- old
+ new
@@ -28,11 +28,11 @@
#include <boost/assert.hpp>
#include <boost/core/addressof.hpp>
#include <boost/core/enable_if.hpp>
#include <boost/core/explicit_operator_bool.hpp>
-#include <boost/core/swap.hpp>
+#include <boost/core/invoke_swap.hpp>
#include <boost/optional/bad_optional_access.hpp>
#include <boost/static_assert.hpp>
#include <boost/throw_exception.hpp>
#include <boost/type.hpp>
#include <boost/type_traits/alignment_of.hpp>
@@ -1258,10 +1258,10 @@
void swap( optional & arg )
BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)
{
// allow for Koenig lookup
- boost::swap(*this, arg);
+ boost::core::invoke_swap(*this, arg);
}
// Returns a reference to the value if this is initialized, otherwise,
// the behaviour is UNDEFINED