[Bug libstdc++/56383] error with multiple enable_shared_from_this base classes

[redi at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56383

--- Comment #4 from Jonathan Wakely <redi at gcc dot gnu.org> ---
Author: redi
Date: Wed Dec  2 15:08:18 2015
New Revision: 231181

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