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

Merged changes from trunk: add namespace scope swap forward declaration to fix member swap copmilation. Swap implementation now uses Boost.Utility.Swap. Fixes #4987.

Browse Source 
[SVN r67307]
This commit is contained in:
Andrey Semashev
2010-12-18 21:29:39 +00:00
parent ef2d285d47
commit 545f8933bc
1 changed files with 65 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,24 +18,25 @@
#include <new> #include <new>
#include <algorithm> #include <algorithm>
#include "boost/config.hpp" #include <boost/config.hpp>
#include "boost/assert.hpp" #include <boost/assert.hpp>
#include "boost/type.hpp" #include <boost/type.hpp>
#include "boost/type_traits/alignment_of.hpp" #include <boost/type_traits/alignment_of.hpp>
#include "boost/type_traits/has_nothrow_constructor.hpp" #include <boost/type_traits/has_nothrow_constructor.hpp>
#include "boost/type_traits/type_with_alignment.hpp" #include <boost/type_traits/type_with_alignment.hpp>
#include "boost/type_traits/remove_reference.hpp" #include <boost/type_traits/remove_reference.hpp>
#include "boost/type_traits/is_reference.hpp" #include <boost/type_traits/is_reference.hpp>
#include "boost/mpl/if.hpp" #include <boost/mpl/if.hpp>
#include "boost/mpl/bool.hpp" #include <boost/mpl/bool.hpp>
#include "boost/mpl/not.hpp" #include <boost/mpl/not.hpp>
#include "boost/detail/reference_content.hpp" #include <boost/detail/reference_content.hpp>
#include "boost/none.hpp" #include <boost/none.hpp>
#include "boost/utility/addressof.hpp" #include <boost/utility/swap.hpp>
#include "boost/utility/compare_pointees.hpp" #include <boost/utility/addressof.hpp>
#include "boost/utility/in_place_factory.hpp" #include <boost/utility/compare_pointees.hpp>
#include <boost/utility/in_place_factory.hpp>
#include "boost/optional/optional_fwd.hpp" #include <boost/optional/optional_fwd.hpp>
#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
// VC6.0 has the following bug: // VC6.0 has the following bug:
@ -98,7 +99,7 @@
namespace boost_optional_detail namespace boost_optional_detail
{ {
template <class T, class Factory> template <class T, class Factory>
void construct(Factory const& factory, void* address) inline void construct(Factory const& factory, void* address)
{ {
factory.BOOST_NESTED_TEMPLATE apply<T>(address); factory.BOOST_NESTED_TEMPLATE apply<T>(address);
} }
@ -110,6 +111,9 @@ namespace boost {
class in_place_factory_base ; class in_place_factory_base ;
class typed_in_place_factory_base ; class typed_in_place_factory_base ;
// This forward is needed to refer to namespace scope swap from the member swap
template<class T> void swap ( optional<T>& x, optional<T>& y );
namespace optional_detail { namespace optional_detail {
// This local class is used instead of that in "aligned_storage.hpp" // This local class is used instead of that in "aligned_storage.hpp"
@ -914,19 +918,8 @@ inline
bool operator >= ( none_t x, optional<T> const& y ) bool operator >= ( none_t x, optional<T> const& y )
{ return !( x < y ) ; } { return !( x < y ) ; }
//
// The following swap implementation follows the GCC workaround as found in
// "boost/detail/compressed_pair.hpp"
//
namespace optional_detail { namespace optional_detail {
// GCC < 3.2 gets the using declaration at namespace scope (FLC, DWA)
#if BOOST_WORKAROUND(__GNUC__, < 3) \
|| BOOST_WORKAROUND(__GNUC__, == 3) && __GNUC_MINOR__ <= 2
using std::swap;
#define BOOST_OPTIONAL_STD_SWAP_INTRODUCED_AT_NS_SCOPE
#endif
template<bool use_default_constructor> struct swap_selector; template<bool use_default_constructor> struct swap_selector;
template<> template<>
@ -935,8 +928,8 @@ namespace optional_detail {
template<class T> template<class T>
static void optional_swap ( optional<T>& x, optional<T>& y ) static void optional_swap ( optional<T>& x, optional<T>& y )
{ {
bool hasX = x; const bool hasX = !!x;
bool hasY = y; const bool hasY = !!y;
if ( !hasX && !hasY ) if ( !hasX && !hasY )
return; return;
@ -946,12 +939,8 @@ namespace optional_detail {
else if ( !hasY ) else if ( !hasY )
y = boost::in_place(); y = boost::in_place();
// GCC > 3.2 and all other compilers have the using declaration at function scope (FLC) // Boost.Utility.Swap will take care of ADL and workarounds for broken compilers
#ifndef BOOST_OPTIONAL_STD_SWAP_INTRODUCED_AT_NS_SCOPE boost::swap(x.get(),y.get());
// allow for Koenig lookup
using std::swap ;
#endif
swap(*x,*y);
if( !hasX ) if( !hasX )
y = boost::none ; y = boost::none ;
@ -966,24 +955,23 @@ namespace optional_detail {
template<class T> template<class T>
static void optional_swap ( optional<T>& x, optional<T>& y ) static void optional_swap ( optional<T>& x, optional<T>& y )
{ {
if ( !x && !!y ) const bool hasX = !!x;
const bool hasY = !!y;
if ( !hasX && hasY )
{ {
x = *y; x = y.get();
y = boost::none ; y = boost::none ;
} }
else if ( !!x && !y ) else if ( hasX && !hasY )
{ {
y = *x ; y = x.get();
x = boost::none ; x = boost::none ;
} }
else if ( !!x && !!y ) else if ( hasX && hasY )
{ {
// GCC > 3.2 and all other compilers have the using declaration at function scope (FLC) // Boost.Utility.Swap will take care of ADL and workarounds for broken compilers
#ifndef BOOST_OPTIONAL_STD_SWAP_INTRODUCED_AT_NS_SCOPE boost::swap(x.get(),y.get());
// allow for Koenig lookup
using std::swap ;
#endif
swap(*x,*y);
} }
} }
}; };
@ -1001,4 +989,3 @@ template<class T> inline void swap ( optional<T>& x, optional<T>& y )
} // namespace boost } // namespace boost
#endif #endif