diff mbox

std::rethrow_exception is broken

Message ID 20140331181935.GI13192@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely March 31, 2014, 6:19 p.m. UTC 
On 31/03/14 19:17 +0100, Jonathan Wakely wrote:
>This improves the static assertion messages, as suggested by François
>and Daniel.
>
>Tested x86_64-linux, committed to trunk.

Oops, apparently mutt doesn't attach attachments until you actually
send the mail, by which time the file I was attaching had changed!

*This* improves the static assertion messages, not the last patch.
commit 0aedd873a6ccc367bac38e1edc347f1774310ebe
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Mar 31 17:51:43 2014 +0100

    	* libsupc++/eh_ptr.cc: Improve static_assert messages.
diff mbox

Patch

diff --git a/libstdc++-v3/libsupc++/eh_ptr.cc b/libstdc++-v3/libsupc++/eh_ptr.cc
index 8c25a81..f974309 100644
--- a/libstdc++-v3/libsupc++/eh_ptr.cc
+++ b/libstdc++-v3/libsupc++/eh_ptr.cc
@@ -48,7 +48,8 @@  template<typename Ex>
 
 static_assert( termHandler<__cxa_exception>()
 	       == termHandler<__cxa_dependent_exception>(),
-	       "__cxa_dependent_exception::termHandler layout is correct" );
+	       "__cxa_dependent_exception::termHandler layout must be"
+	       " consistent with __cxa_exception::termHandler" );
 
 #ifndef __ARM_EABI_UNWINDER__
 template<typename Ex>
@@ -57,7 +58,8 @@  template<typename Ex>
 
 static_assert( adjptr<__cxa_exception>()
 	       == adjptr<__cxa_dependent_exception>(),
-	       "__cxa_dependent_exception::adjustedPtr layout is correct" );
+	       "__cxa_dependent_exception::adjustedPtr layout must be"
+	       " consistent with __cxa_exception::adjustedPtr" );
 #endif
 }