Fix ambiguity with multiple enable_shared_from_this bases
authorJonathan Wakely <jwakely@redhat.com>
Wed, 2 Dec 2015 15:08:18 +0000 (15:08 +0000)
committerJonathan Wakely <redi@gcc.gnu.org>
Wed, 2 Dec 2015 15:08:18 +0000 (15:08 +0000)
commit28eca950b760f1e98f0626a441ffd48b8baad153
tree16176a7b9a98ecf16ffc3383b11cf76317a9c0e2
parentf313d112b04b691b736a75f72af49ca6779e9236
Fix ambiguity with multiple enable_shared_from_this bases

PR libstdc++/56383
* testsuite/20_util/enable_shared_from_this/56383.cc: New.
* include/bits/shared_ptr_base.h (__enable_shared_from_this): Make
friend declaration match previous declaration of
__enable_shared_from_this_helper.
* include/bits/shared_ptr.h (enable_shared_from_this): Likewise.

From-SVN: r231181
libstdc++-v3/ChangeLog
libstdc++-v3/include/bits/shared_ptr.h
libstdc++-v3/include/bits/shared_ptr_base.h
libstdc++-v3/testsuite/20_util/enable_shared_from_this/56383.cc [new file with mode: 0644]