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

Fix SFINAE conditions on emplace<U>

Browse Source
This commit is contained in:
Peter Dimov
2019-02-18 20:40:17 +02:00
parent 8f2ef7ddc1
commit 24fae0f542
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1171,16 +1171,20 @@ public:
// modifiers // modifiers
template<class U, class... A, class I = mp_find<variant<T...>, U>, class E = typename std::enable_if<std::is_constructible<U, A...>::value>::type> template<class U, class... A,
class E = typename std::enable_if< mp_count<variant<T...>, U>::value == 1 && std::is_constructible<U, A...>::value >::type>
BOOST_CXX14_CONSTEXPR U& emplace( A&&... a ) BOOST_CXX14_CONSTEXPR U& emplace( A&&... a )
{ {
using I = mp_find<variant<T...>, U>;
variant_base::template emplace<I::value>( std::forward<A>(a)... ); variant_base::template emplace<I::value>( std::forward<A>(a)... );
return _get_impl( I() ); return _get_impl( I() );
} }
template<class U, class V, class... A, class I = mp_find<variant<T...>, U>, class E = typename std::enable_if<std::is_constructible<U, std::initializer_list<V>&, A...>::value>::type> template<class U, class V, class... A,
class E = typename std::enable_if< mp_count<variant<T...>, U>::value == 1 && std::is_constructible<U, std::initializer_list<V>&, A...>::value >::type>
BOOST_CXX14_CONSTEXPR U& emplace( std::initializer_list<V> il, A&&... a ) BOOST_CXX14_CONSTEXPR U& emplace( std::initializer_list<V> il, A&&... a )
{ {
using I = mp_find<variant<T...>, U>;
variant_base::template emplace<I::value>( il, std::forward<A>(a)... ); variant_base::template emplace<I::value>( il, std::forward<A>(a)... );
return _get_impl( I() ); return _get_impl( I() );
} }