commit 546498cb4817d6a0e78d79c6d244495961ba1c73
author Marshall Clow <mclow.lists@gmail.com> Wed Aug 17 23:24:02 2016 +0000
committer Marshall Clow <mclow.lists@gmail.com> Wed Aug 17 23:24:02 2016 +0000
tree 4700c431ef32ce10b480e47f94c077dbd123e35f
parent d4badbbc5a4c63fa9c644d4ae78ec0e38564c8dc

make the associative containers do the right thing for propogate_on_container_assignment. Fixes bug #29001. Tests are only for <map> right now - more complete tests will come when we revamp our allocator testing structure.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@279008 91177308-0d34-0410-b5e6-96231b3b80d8

include/__tree

diff --git a/include/__tree b/include/__tree
index bfcec78..b560bf0 100644
--- a/include/__tree
+++ b/include/__tree
@@ -1419,7 +1419,11 @@
 
     _LIBCPP_INLINE_VISIBILITY
     void __copy_assign_alloc(const __tree& __t, true_type)
-        {__node_alloc() = __t.__node_alloc();}
+        {
+        if (__node_alloc() != __t.__node_alloc())
+        	clear();
+        __node_alloc() = __t.__node_alloc();
+        }
     _LIBCPP_INLINE_VISIBILITY
     void __copy_assign_alloc(const __tree& __t, false_type) {}