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

Fix msvc-14.1 regression

Browse Source
This commit is contained in:
Peter Dimov
2018-10-18 07:28:39 +03:00
parent 90cc6b7374
commit 9b9c5b2e74
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,17 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>>&& get(variant<T...>&& v) template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>>&& get(variant<T...>&& v)
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920)
return (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp_size_t<I>() ) ); return (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp_size_t<I>() ) );
#else
if( v.index() != I ) throw bad_variant_access();
return std::move( v._get_impl( mp_size_t<I>() ) );
#endif
} }
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const& get(variant<T...> const& v) template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const& get(variant<T...> const& v)
@@ -152,7 +162,17 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const&& get(variant<T...> const&& v) template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const&& get(variant<T...> const&& v)
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920)
return (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp_size_t<I>() ) ); return (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp_size_t<I>() ) );
#else
if( v.index() != I ) throw bad_variant_access();
return std::move( v._get_impl( mp_size_t<I>() ) );
#endif
} }
// get (type) // get (type)
@@ -172,7 +192,16 @@ template<class U, class... T> constexpr U&& get(variant<T...>&& v)
using I = mp_find<variant<T...>, U>; using I = mp_find<variant<T...>, U>;
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920)
return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), std::move( v._get_impl( I() ) ); return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), std::move( v._get_impl( I() ) );
#else
if( v.index() != I::value ) throw bad_variant_access();
return std::move( v._get_impl( I() ) );
#endif
} }
template<class U, class... T> constexpr U const& get(variant<T...> const& v) template<class U, class... T> constexpr U const& get(variant<T...> const& v)
@@ -190,7 +219,16 @@ template<class U, class... T> constexpr U const&& get(variant<T...> const&& v)
using I = mp_find<variant<T...>, U>; using I = mp_find<variant<T...>, U>;
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920)
return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), std::move( v._get_impl( I() ) ); return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), std::move( v._get_impl( I() ) );
#else
if( v.index() != I::value ) throw bad_variant_access();
return std::move( v._get_impl( I() ) );
#endif
} }
// get_if // get_if