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

Introduce detail::throw_bad_variant_access

Browse Source
This commit is contained in:
Peter Dimov
2019-06-03 01:05:15 +03:00
parent 6b617ae3a8
commit adeb970be6
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,16 @@ public:
} }
}; };
namespace detail
{
BOOST_NORETURN inline void throw_bad_variant_access()
{
throw bad_variant_access();
}
} // namespace detail
// monostate // monostate
struct monostate struct monostate
@ -283,7 +293,7 @@ template<class U, class... T> constexpr bool holds_alternative( variant<T...> co
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" );
return (void)( v.index() != I? throw bad_variant_access(): 0 ), v._get_impl( mp11::mp_size_t<I>() ); return ( v.index() != I? detail::throw_bad_variant_access(): (void)0 ), v._get_impl( mp11::mp_size_t<I>() );
} }
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)
@ -292,11 +302,11 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1930) #if !BOOST_WORKAROUND(BOOST_MSVC, < 1930)
return (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp11::mp_size_t<I>() ) ); return ( v.index() != I? detail::throw_bad_variant_access(): (void)0 ), std::move( v._get_impl( mp11::mp_size_t<I>() ) );
#else #else
if( v.index() != I ) throw bad_variant_access(); if( v.index() != I ) detail::throw_bad_variant_access();
return std::move( v._get_impl( mp11::mp_size_t<I>() ) ); return std::move( v._get_impl( mp11::mp_size_t<I>() ) );
#endif #endif
@ -305,7 +315,7 @@ 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" );
return (void)( v.index() != I? throw bad_variant_access(): 0 ), v._get_impl( mp11::mp_size_t<I>() ); return ( v.index() != I? detail::throw_bad_variant_access(): (void)0 ), v._get_impl( mp11::mp_size_t<I>() );
} }
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)
@ -314,11 +324,11 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1930) #if !BOOST_WORKAROUND(BOOST_MSVC, < 1930)
return (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp11::mp_size_t<I>() ) ); return ( v.index() != I? detail::throw_bad_variant_access(): (void)0 ), std::move( v._get_impl( mp11::mp_size_t<I>() ) );
#else #else
if( v.index() != I ) throw bad_variant_access(); if( v.index() != I ) detail::throw_bad_variant_access();
return std::move( v._get_impl( mp11::mp_size_t<I>() ) ); return std::move( v._get_impl( mp11::mp_size_t<I>() ) );
#endif #endif
@ -363,7 +373,7 @@ template<class U, class... T> constexpr U& get(variant<T...>& v)
using I = mp11::mp_find<variant<T...>, U>; using I = mp11::mp_find<variant<T...>, U>;
return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), v._get_impl( I() ); return ( v.index() != I::value? detail::throw_bad_variant_access(): (void)0 ), v._get_impl( I() );
} }
template<class U, class... T> constexpr U&& get(variant<T...>&& v) template<class U, class... T> constexpr U&& get(variant<T...>&& v)
@ -374,11 +384,11 @@ template<class U, class... T> constexpr U&& get(variant<T...>&& v)
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1930) #if !BOOST_WORKAROUND(BOOST_MSVC, < 1930)
return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), std::move( v._get_impl( I() ) ); return ( v.index() != I::value? detail::throw_bad_variant_access(): (void)0 ), std::move( v._get_impl( I() ) );
#else #else
if( v.index() != I::value ) throw bad_variant_access(); if( v.index() != I::value ) detail::throw_bad_variant_access();
return std::move( v._get_impl( I() ) ); return std::move( v._get_impl( I() ) );
#endif #endif
@ -390,7 +400,7 @@ template<class U, class... T> constexpr U const& get(variant<T...> const& v)
using I = mp11::mp_find<variant<T...>, U>; using I = mp11::mp_find<variant<T...>, U>;
return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), v._get_impl( I() ); return ( v.index() != I::value? detail::throw_bad_variant_access(): (void)0 ), v._get_impl( I() );
} }
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)
@ -401,11 +411,11 @@ template<class U, class... T> constexpr U const&& get(variant<T...> const&& v)
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1930) #if !BOOST_WORKAROUND(BOOST_MSVC, < 1930)
return (void)( v.index() != I::value? throw bad_variant_access(): 0 ), std::move( v._get_impl( I() ) ); return ( v.index() != I::value? detail::throw_bad_variant_access(): (void)0 ), std::move( v._get_impl( I() ) );
#else #else
if( v.index() != I::value ) throw bad_variant_access(); if( v.index() != I::value ) detail::throw_bad_variant_access();
return std::move( v._get_impl( I() ) ); return std::move( v._get_impl( I() ) );
#endif #endif
@ -1373,7 +1383,7 @@ private:
template<class... U, class V> static variant<U...> _subset_impl( mp11::mp_size_t<sizeof...(U)>, V && /*v*/ ) template<class... U, class V> static variant<U...> _subset_impl( mp11::mp_size_t<sizeof...(U)>, V && /*v*/ )
{ {
throw bad_variant_access(); detail::throw_bad_variant_access();
} }
private: private: