Commit a6ea72bf by Jason Merrill Committed by Jason Merrill

re PR libstdc++/61728 (lost symbol…

re PR libstdc++/61728 (lost symbol FUNC:_ZNK10__cxxabiv117__pbase_type_info15__pointer_catchEPKS0_PPvj@@CXXABI_1.3)

	PR libstdc++/61728
	* libsupc++/cxxabi.h: Define __pbase_type_info::__pointer_catch here.
	* libsupc++/tinfo.h: Not here.

From-SVN: r212413
parent 84b64170
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> 2014-07-08 Jonathan Wakely <jwakely@redhat.com>
* include/bits/allocated_ptr.h (__allocated_ptr::operator=): Add * include/bits/allocated_ptr.h (__allocated_ptr::operator=): Add
......
...@@ -298,11 +298,19 @@ namespace __cxxabiv1 ...@@ -298,11 +298,19 @@ namespace __cxxabiv1
__do_catch(const std::type_info* __thr_type, void** __thr_obj, __do_catch(const std::type_info* __thr_type, void** __thr_obj,
unsigned int __outer) const; unsigned int __outer) const;
virtual bool inline virtual bool
__pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj, __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. // Type information for simple pointers.
class __pointer_type_info : public __pbase_type_info class __pointer_type_info : public __pbase_type_info
{ {
......
...@@ -31,14 +31,6 @@ ...@@ -31,14 +31,6 @@
namespace __cxxabiv1 { 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 { namespace {
using namespace std; using namespace std;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment