aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/util/testsuite_allocator.h6
2 files changed, 10 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1e35102..02bb86f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-07 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * testsuite/util/testsuite_allocator.h (uneq_allocator): Add
+ propagate_on_container_swap typedef for C++0x testing.
+
2011-10-06 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/27_io/ios_base/cons/assign_neg.cc: Tidy dg- directives,
diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h
index 454108c..38bfac8 100644
--- a/libstdc++-v3/testsuite/util/testsuite_allocator.h
+++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h
@@ -256,7 +256,11 @@ namespace __gnu_test
typedef Tp& reference;
typedef const Tp& const_reference;
typedef Tp value_type;
-
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ typedef std::true_type propagate_on_container_swap;
+#endif
+
template<typename Tp1>
struct rebind
{ typedef uneq_allocator<Tp1> other; };