boostorg/variant2
1
0
Fork 1
mirror of https://github.com/boostorg/variant2.git synced 2025-08-01 21:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt at g+ 5 fix

Browse Source
This commit is contained in:
Peter Dimov
2017-05-31 05:36:35 +03:00
parent 08bfd69387
commit ab0d867411
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,9 +116,16 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
{
static_assert( I < sizeof...(T), "Index out of bounds" );
if( v.index() != I ) throw bad_variant_access();
#if BOOST_WORKAROUND( BOOST_GCC, < 60000 )
return (void)( v.index() != I? throw bad_variant_access(): 0), v._get_impl( mp_size_t<I>() );
#else
if( v.index() != I ) throw bad_variant_access();
return v._get_impl( mp_size_t<I>() );
#endif
}
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>>&& get(variant<T...>&& v)
@@ -134,9 +141,16 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
{
static_assert( I < sizeof...(T), "Index out of bounds" );
if( v.index() != I ) throw bad_variant_access();
#if BOOST_WORKAROUND( BOOST_GCC, < 60000 )
return (void)( v.index() != I? throw bad_variant_access(): 0), v._get_impl( mp_size_t<I>() );
#else
if( v.index() != I ) throw bad_variant_access();
return 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)
@@ -155,9 +169,16 @@ template<class U, class... T> constexpr U& get(variant<T...>& v)
static_assert( mp_count<variant<T...>, U>::value == 1, "The type must occur exactly once in the list of variant alternatives" );
constexpr auto I = mp_find<variant<T...>, U>::value;
if( v.index() != I ) throw bad_variant_access();
#if BOOST_WORKAROUND( BOOST_GCC, < 60000 )
return (void)( v.index() != I? throw bad_variant_access(): 0), v._get_impl( mp_size_t<I>() );
#else
if( v.index() != I ) throw bad_variant_access();
return v._get_impl( mp_size_t<I>() );
#endif
}
template<class U, class... T> constexpr U&& get(variant<T...>&& v)
@@ -175,9 +196,16 @@ template<class U, class... T> constexpr U const& get(variant<T...> const& v)
static_assert( mp_count<variant<T...>, U>::value == 1, "The type must occur exactly once in the list of variant alternatives" );
constexpr auto I = mp_find<variant<T...>, U>::value;
if( v.index() != I ) throw bad_variant_access();
#if BOOST_WORKAROUND( BOOST_GCC, < 60000 )
return (void)( v.index() != I? throw bad_variant_access(): 0), v._get_impl( mp_size_t<I>() );
#else
if( v.index() != I ) throw bad_variant_access();
return v._get_impl( mp_size_t<I>() );
#endif
}
template<class U, class... T> constexpr U const&& get(variant<T...> const&& v)