From abb7b551cc440f0fcd177ca07a0476ea57bf26c3 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Wed, 31 May 2017 05:46:34 +0300
Subject: [PATCH] Extend g++5 workaround for consistency to rvalue overloads

---
 include/boost/variant2/variant.hpp | 38 ++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/include/boost/variant2/variant.hpp b/include/boost/variant2/variant.hpp
index 5b3fc76..145df70 100644
--- a/include/boost/variant2/variant.hpp
+++ b/include/boost/variant2/variant.hpp
@@ -122,7 +122,7 @@ template<std::size_t I, class... T> constexpr variant_alternative_t<I, variant<T
 
 #else
 
-	if( v.index() != I ) throw bad_variant_access();
+    if( v.index() != I ) throw bad_variant_access();
     return v._get_impl( mp_size_t<I>() );
 
 #endif
@@ -132,9 +132,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), 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)
@@ -157,9 +164,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), 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
@@ -186,9 +200,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), 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<class U, class... T> constexpr U const& get(variant<T...> const& v)
@@ -213,9 +234,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), 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_if