diff options
| author | jyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-31 23:56:01 +0000 |
|---|---|---|
| committer | jyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-31 23:56:01 +0000 |
| commit | 27efa7f88c88ff5a3124e61570673a949a7ec72b (patch) | |
| tree | 000d1fbf8ce26642660a4c5617c8144abd8998f4 /libstdc++-v3 | |
| parent | 524b52f80ebabad69b05ce767f90001576b869b1 (diff) | |
| download | ppe42-gcc-27efa7f88c88ff5a3124e61570673a949a7ec72b.tar.gz ppe42-gcc-27efa7f88c88ff5a3124e61570673a949a7ec72b.zip | |
exception_ptr.h needs the forward declaration because it's
included from <typeinfo> before <typeinfo> defines std::type_info.
Tested:
bootstrap + make check-c++ on x86_64.
libstdc++-v3/ChangeLog:
2011-03-31 Jeffrey Yasskin <jyasskin@google.com>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171807 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/exception_ptr.h | 2 | ||||
| -rw-r--r-- | 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 <jyasskin@google.com> + + * 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 <paolo.carlini@oracle.com> 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<typename _Ex> inline void - __throw_with_nested(_Ex&& __ex, const nested_exception* = 0) + __throw_with_nested(_Ex&& __ex, const nested_exception*) { throw __ex; } template<typename _Ex> |
