This is the mail archive of the
gcc-cvs@gcc.gnu.org
mailing list for the GCC project.
r231701 - in /branches/gcc-4_9-branch/libstdc++...
- From: redi at gcc dot gnu dot org
- To: gcc-cvs at gcc dot gnu dot org
- Date: Wed, 16 Dec 2015 17:09:47 -0000
- Subject: r231701 - in /branches/gcc-4_9-branch/libstdc++...
Author: redi
Date: Wed Dec 16 17:09:47 2015
New Revision: 231701
URL: https://gcc.gnu.org/viewcvs?rev=231701&root=gcc&view=rev
Log:
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.
Added:
branches/gcc-4_9-branch/libstdc++-v3/testsuite/20_util/enable_shared_from_this/56383.cc
Modified:
branches/gcc-4_9-branch/libstdc++-v3/ChangeLog
branches/gcc-4_9-branch/libstdc++-v3/include/bits/shared_ptr.h
branches/gcc-4_9-branch/libstdc++-v3/include/bits/shared_ptr_base.h