From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 31 Mar 2014 18:16:14 +0000 (+0100)
Subject: * libsupc++/eh_ptr.cc: Improve static_assert messages.
X-Git-Tag: basepoints/gcc-5~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0812493fc5033efb84acd3fc5fa96afee13e6054;p=thirdparty%2Fgcc.git

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

From-SVN: r208965
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 37a9a1027751..b1c0c60c638f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-31  Jonathan Wakely  <jwakely@redhat.com>
+
+	* libsupc++/eh_ptr.cc: Improve static_assert messages.
+
 2014-03-31  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* testsuite/18_support/exception_ptr/60612-terminate.cc
diff --git a/libstdc++-v3/libsupc++/eh_ptr.cc b/libstdc++-v3/libsupc++/eh_ptr.cc
index 8c25a81ae4a9..f9743095e91d 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
 }