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

Make unsafe_get public

Browse Source
This commit is contained in:
Peter Dimov
2021-09-11 17:29:21 +03:00
parent 9d40bc80f1
commit dce8174550
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,37 +365,44 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
#endif #endif
} }
// detail::unsafe_get (for visit) // unsafe_get
namespace detail
{
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>>& unsafe_get(variant<T...>& v) template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>>& unsafe_get(variant<T...>& v)
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
BOOST_ASSERT( v.index() == I );
return v._get_impl( mp11::mp_size_t<I>() ); return v._get_impl( mp11::mp_size_t<I>() );
} }
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>>&& unsafe_get(variant<T...>&& v) template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>>&& unsafe_get(variant<T...>&& v)
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
BOOST_ASSERT( v.index() == I );
return std::move( v._get_impl( mp11::mp_size_t<I>() ) ); return std::move( v._get_impl( mp11::mp_size_t<I>() ) );
} }
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const& unsafe_get(variant<T...> const& v) template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const& unsafe_get(variant<T...> const& v)
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
BOOST_ASSERT( v.index() == I );
return v._get_impl( mp11::mp_size_t<I>() ); return v._get_impl( mp11::mp_size_t<I>() );
} }
template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const&& unsafe_get(variant<T...> const&& v) template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T...>> const&& unsafe_get(variant<T...> const&& v)
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
BOOST_ASSERT( v.index() == I );
return std::move( v._get_impl( mp11::mp_size_t<I>() ) ); return std::move( v._get_impl( mp11::mp_size_t<I>() ) );
} }
} // namespace detail
// get (type) // get (type)
template<class U, class... T> constexpr U& get(variant<T...>& v) template<class U, class... T> constexpr U& get(variant<T...>& v)
@ -2174,7 +2181,7 @@ template<class R = detail::deduced, class F, class V1, class V2, class... V> con
{ {
return mp11::mp_with_index<detail::variant_base_size<V1>>( v1.index(), [&]( auto I ){ return mp11::mp_with_index<detail::variant_base_size<V1>>( v1.index(), [&]( auto I ){
auto f2 = [&]( auto&&... a ){ return std::forward<F>(f)( detail::unsafe_get<I.value>( std::forward<V1>(v1) ), std::forward<decltype(a)>(a)... ); }; auto f2 = [&]( auto&&... a ){ return std::forward<F>(f)( unsafe_get<I.value>( std::forward<V1>(v1) ), std::forward<decltype(a)>(a)... ); };
return visit<R>( f2, std::forward<V2>(v2), std::forward<V>(v)... ); return visit<R>( f2, std::forward<V2>(v2), std::forward<V>(v)... );
}); });