diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_ptr.cc | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 37a9a102775..b1c0c60c638 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 8c25a81ae4a..f9743095e91 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 } |
