diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 13 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_allocator.h | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6424c55..7ec671c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-07-11 Paolo Carlini <paolo.carlini@oracle.com> + + * testsuite/util/testsuite_allocator.h (propagating_allocator<>:: + operator=(const propagating_allocator<>&)): Retun *this. + 2011-07-09 Jonathan Wakely <jwakely.gcc@gmail.com> * include/Makefile.am: Add new header. @@ -24,10 +29,10 @@ Adjust dg-error line numbers. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Likewise. - * testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc: - Likewise. - * testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc: - Likewise. + * testsuite/23_containers/vector/requirements/dr438/ + constructor_1_neg.cc: Likewise. + * testsuite/23_containers/vector/requirements/dr438/ + constructor_2_neg.cc: Likewise. 2011-07-09 Jonathan Wakely <jwakely.gcc@gmail.com> diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h index 3b9fb28..5ef5cdb 100644 --- a/libstdc++-v3/testsuite/util/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h @@ -408,6 +408,7 @@ namespace __gnu_test { static_assert(P2, "assigning propagating_allocator<T, true>"); propagating_allocator(a).swap_base(*this); + return *this; } // postcondition: a.get_personality() == 0 |