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

Update msvc workarounds for msvc-14.2

Browse Source
This commit is contained in:
Peter Dimov
2019-04-09 19:54:53 +03:00
parent 2d6385031e
commit e8e56139a8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,7 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920) #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 (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp11::mp_size_t<I>() ) );
@@ -312,7 +312,7 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
{ {
static_assert( I < sizeof...(T), "Index out of bounds" ); static_assert( I < sizeof...(T), "Index out of bounds" );
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920) #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 (void)( v.index() != I? throw bad_variant_access(): 0 ), std::move( v._get_impl( mp11::mp_size_t<I>() ) );
@@ -372,7 +372,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>;
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920) #if !BOOST_WORKAROUND(BOOST_MSVC, < 1930)
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() ) );
@@ -399,7 +399,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>;
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1920) #if !BOOST_WORKAROUND(BOOST_MSVC, < 1930)
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() ) );
@@ -578,7 +578,7 @@ template<class T1, class... T> struct overload<T1, T...>: overload<T...>
mp11::mp_identity<T1> operator()(T1) const; mp11::mp_identity<T1> operator()(T1) const;
}; };
#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) #if BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
template<class U, class... T> using resolve_overload_type_ = decltype( overload<T...>()(std::declval<U>()) ); template<class U, class... T> using resolve_overload_type_ = decltype( overload<T...>()(std::declval<U>()) );