diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-09 22:21:49 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-09 22:21:49 +0000 |
| commit | 490d295f3e48c2a996086184fbc0c09c313ce76a (patch) | |
| tree | ade1c4c15fdc7664170cea55d36cff83e2d3cd49 /libstdc++-v3 | |
| parent | 14421d5651d1ac18ceb798fba8c9054a82a3e599 (diff) | |
| download | gcc-490d295f3e48c2a996086184fbc0c09c313ce76a.tar.gz | |
PR libstdc++/61728
* libsupc++/cxxabi.h: Define __pbase_type_info::__pointer_catch here.
* libsupc++/tinfo.h: Not here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212413 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/cxxabi.h | 12 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/tinfo.h | 8 |
3 files changed, 16 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7e03e7953c6..95c8aadb463 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2014-07-09 Jason Merrill <jason@redhat.com> + + PR libstdc++/61728 + * libsupc++/cxxabi.h: Define __pbase_type_info::__pointer_catch here. + * libsupc++/tinfo.h: Not here. + 2014-07-08 Jonathan Wakely <jwakely@redhat.com> * include/bits/allocated_ptr.h (__allocated_ptr::operator=): Add diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h index 5b77aee9e6c..4d9458c2e84 100644 --- a/libstdc++-v3/libsupc++/cxxabi.h +++ b/libstdc++-v3/libsupc++/cxxabi.h @@ -298,11 +298,19 @@ namespace __cxxabiv1 __do_catch(const std::type_info* __thr_type, void** __thr_obj, unsigned int __outer) const; - virtual bool + inline virtual bool __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj, - unsigned __outer) const = 0; + unsigned __outer) const; }; + inline bool __pbase_type_info:: + __pointer_catch (const __pbase_type_info *thrown_type, + void **thr_obj, + unsigned outer) const + { + return __pointee->__do_catch (thrown_type->__pointee, thr_obj, outer + 2); + } + // Type information for simple pointers. class __pointer_type_info : public __pbase_type_info { diff --git a/libstdc++-v3/libsupc++/tinfo.h b/libstdc++-v3/libsupc++/tinfo.h index 7c55f02376f..3421a5c6253 100644 --- a/libstdc++-v3/libsupc++/tinfo.h +++ b/libstdc++-v3/libsupc++/tinfo.h @@ -31,14 +31,6 @@ namespace __cxxabiv1 { -inline bool __pbase_type_info:: -__pointer_catch (const __pbase_type_info *thrown_type, - void **thr_obj, - unsigned outer) const -{ - return __pointee->__do_catch (thrown_type->__pointee, thr_obj, outer + 2); -} - namespace { using namespace std; |