From 3c16cf85177836abb4a771683fe30c3ee7e3d432 Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Thu, 31 Mar 2011 23:56:01 +0000 Subject: [PATCH] exception_ptr.h needs the forward declaration because it's included from... exception_ptr.h needs the forward declaration because it's included from before defines std::type_info. Tested: bootstrap + make check-c++ on x86_64. libstdc++-v3/ChangeLog: 2011-03-31 Jeffrey Yasskin * libsupc++/exception_ptr.h: Forward-declare std::type_info. * libsupc++/nested_exception.h (__throw_with_nested): Remove a redundant default argument from std::__throw_with_nested. From-SVN: r171807 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/libsupc++/exception_ptr.h | 2 +- libstdc++-v3/libsupc++/nested_exception.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 26834e5f928..ea4b6d49139 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-03-31 Jeffrey Yasskin + + * libsupc++/exception_ptr.h: Forward-declare std::type_info. + * libsupc++/nested_exception.h (__throw_with_nested): Remove a + redundant default argument from std::__throw_with_nested. + 2011-03-31 Paolo Carlini PR libstdc++/48382 diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index ef826f6bad0..26117cd5d09 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -137,7 +137,7 @@ namespace std operator==(const exception_ptr&, const exception_ptr&) throw() __attribute__ ((__pure__)); - const type_info* + const class type_info* __cxa_exception_type() const throw() __attribute__ ((__pure__)); }; diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h index 6a4f04e2e07..d4804bbedc5 100644 --- a/libstdc++-v3/libsupc++/nested_exception.h +++ b/libstdc++-v3/libsupc++/nested_exception.h @@ -117,7 +117,7 @@ namespace std // with a type that has an accessible nested_exception base. template inline void - __throw_with_nested(_Ex&& __ex, const nested_exception* = 0) + __throw_with_nested(_Ex&& __ex, const nested_exception*) { throw __ex; } template -- 2.30.2