From ab0d8674114f0c1006d6e0566355549cc68414d1 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Wed, 31 May 2017 05:36:35 +0300
Subject: [PATCH] Another attempt at g+ 5 fix

---
 include/boost/variant2/variant.hpp | 36 ++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/include/boost/variant2/variant.hpp b/include/boost/variant2/variant.hpp
index 3506524..5b3fc76 100644
--- a/include/boost/variant2/variant.hpp
+++ b/include/boost/variant2/variant.hpp
@@ -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)