r231308 - in /branches/gcc-5-branch/libstdc++-v...

[redi@gcc.gnu.org]

Author: redi
Date: Fri Dec  4 20:44:22 2015
New Revision: 231308

URL: https://gcc.gnu.org/viewcvs?rev=231308&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-5-branch/libstdc++-v3/testsuite/20_util/enable_shared_from_this/56383.cc
Modified:
    branches/gcc-5-branch/libstdc++-v3/ChangeLog
    branches/gcc-5-branch/libstdc++-v3/include/bits/shared_ptr.h
    branches/gcc-5-branch/libstdc++-v3/include/bits/shared_ptr_base.h