Ticket #2101: boost_variant_no_exceptions.diff

boost/variant/get.hpp

@@ -177 +177 @@
     U_ptr result = get<U>(&operand);
 
     if (!result)
-        throw bad_get();
+        boost::throw_exception(bad_get());
     return *result;
 }
 
@@ -193 +193 @@
     U_ptr result = get<const U>(&operand);
 
     if (!result)
-        throw bad_get();
+        boost::throw_exception(bad_get());
     return *result;
 }
 

boost/variant/variant.hpp

@@ -613 +613 @@
             // ...and attempt to copy rhs content into lhs storage:
             new(lhs_.storage_.address()) RhsT(rhs_content_);
         }
+#ifndef BOOST_NO_EXCEPTIONS
         catch (...)
         {
             // In case of failure, copy backup pointer to lhs storage...
@@ -625 +626 @@
             // ...and rethrow:
             throw;
         }
+#endif 
 
         // In case of success, indicate new content type...
         lhs_.indicate_which(rhs_which_); // nothrow