boostorg/variant2
1
0
Fork 1
mirror of https://github.com/boostorg/variant2.git synced 2025-07-31 12:47:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

The msvc-14.0 workarounds are no longer needed

Browse Source
This commit is contained in:
Peter Dimov
2020-01-22 20:14:11 +02:00
parent 3b2fb1a48a
commit ef2ef292b9
1 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/boost/variant2/variant.hpp
View File

@ -1530,27 +1530,9 @@ public:
{ {
} }
#if !BOOST_WORKAROUND( BOOST_MSVC, < 1910 )
// variant( variant const& ) = default; // variant( variant const& ) = default;
// variant( variant && ) = default; // variant( variant && ) = default;
#else
private:
variant( variant const volatile& ) = delete;
public:
template<class E = std::enable_if< std::is_copy_constructible<variant_base>::value >::type>
constexpr variant( variant const& r ) noexcept( std::is_nothrow_copy_constructible<variant_base>::value ): variant_base( static_cast<variant_base const&>( r ) ) {}
template<class E = std::enable_if< std::is_move_constructible<variant_base>::value >::type>
constexpr variant( variant && r ) noexcept( std::is_nothrow_move_constructible<variant_base>::value ): variant_base( static_cast<variant_base &&>( r ) ) {}
#endif
template<class U, template<class U,
class Ud = typename std::decay<U>::type, class Ud = typename std::decay<U>::type,
class E1 = typename std::enable_if< !std::is_same<Ud, variant>::value && !detail::is_in_place_index<Ud>::value && !detail::is_in_place_type<Ud>::value >::type, class E1 = typename std::enable_if< !std::is_same<Ud, variant>::value && !detail::is_in_place_index<Ud>::value && !detail::is_in_place_type<Ud>::value >::type,
@ -1585,35 +1567,9 @@ public:
// assignment // assignment
#if !BOOST_WORKAROUND( BOOST_MSVC, < 1910 )
// variant& operator=( variant const& ) = default; // variant& operator=( variant const& ) = default;
// variant& operator=( variant && ) = default; // variant& operator=( variant && ) = default;
#else
private:
variant& operator=( variant const volatile& ) = delete;
public:
template<class E = std::enable_if< std::is_copy_assignable<variant_base>::value >::type>
variant& operator=( variant const& r ) noexcept( std::is_nothrow_copy_assignable<variant_base>::value )
{
static_cast< variant_base& >( *this ) = static_cast< variant_base const& >( r );
return *this;
}
template<class E = std::enable_if< std::is_move_assignable<variant_base>::value >::type>
variant& operator=( variant && r ) noexcept( std::is_nothrow_move_assignable<variant_base>::value )
{
static_cast< variant_base& >( *this ) = static_cast< variant_base && >( r );
return *this;
}
#endif
template<class U, template<class U,
class E1 = typename std::enable_if<!std::is_same<typename std::decay<U>::type, variant>::value>::type, class E1 = typename std::enable_if<!std::is_same<typename std::decay<U>::type, variant>::value>::type,
class V = detail::resolve_overload_type<U, T...>, class V = detail::resolve_overload_type<U, T...>,