Only set std::enable_shared_from_this member once.

[thirdparty/gcc.git] / libstdc++-v3 / ChangeLog

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0bc0aca0211dc873559c46d66fb4974099790e64..0e99af68374c5034c639aa36ac9e839d57bd8a79 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,15 @@
 2015-08-26  Jonathan Wakely  <jwakely@redhat.com>
 
+       * include/bits/shared_ptr.h (__enable_shared_from_this_helper): Use
+       nullptr.
+       * include/bits/shared_ptr_base.h (weak_ptr::_M_assign): Don't assign
+       if ownership is already shared with a shared_ptr object.
+       (__enable_shared_from_this_helper): Use nullptr.
+       * testsuite/20_util/enable_shared_from_this/members/const.cc: New.
+       * testsuite/20_util/enable_shared_from_this/members/reinit.cc: New.
+       * testsuite/20_util/enable_shared_from_this/requirements/
+       explicit_instantiation.cc: Instantiate with const and incomplete types.
+
        * include/debug/map.h (map::try_emplace, map::insert_or_assign):
        Define.
        * include/debug/unordered_map (unordered_map::try_emplace,