feedc0de/boost_variant2
1
0
Fork 0
forked from boostorg/variant2
Code Pull Requests Activity

Explicitly disable move constructor when needed

Browse Source
This commit is contained in:
Peter Dimov
2020-01-22 18:30:36 +02:00
parent 17bc06b090
commit 4f81882bfd
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1238,9 +1238,28 @@ public:
} // namespace detail
// disable_move_constructor
namespace detail
{
template<bool MoveConstructible> struct disable_move_constructor;
template<> struct disable_move_constructor<true>
{
};
template<> struct disable_move_constructor<false>
{
disable_move_constructor() = default;
disable_move_constructor( disable_move_constructor && ) = delete;
};
} // namespace detail
// variant
template<class... T> class variant: private detail::variant_copy_base<T...>
template<class... T> class variant: private detail::variant_copy_base<T...>, private detail::disable_move_constructor<mp11::mp_all<std::is_move_constructible<T>...>::value>
{
private:
@ -1259,8 +1278,8 @@ public:
#if !BOOST_WORKAROUND( BOOST_MSVC, < 1910 )
variant( variant const& ) = default;
variant( variant && ) = default;
// variant( variant const& ) = default;
// variant( variant && ) = default;
#else
@ -1314,8 +1333,8 @@ public:
#if !BOOST_WORKAROUND( BOOST_MSVC, < 1910 )
variant& operator=( variant const& ) = default;
variant& operator=( variant && ) = default;
// variant& operator=( variant const& ) = default;
// variant& operator=( variant && ) = default;
#else