From 0e8330d91d13ed0200ef902c596d349ab1969d19 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Mon, 19 Nov 2012 22:35:11 +0000
Subject: [PATCH] typedefs.cc: Check rebind and improve
 propagate_on_container_move_assignment check.

	* testsuite/20_util/allocator/requirements/typedefs.cc: Check rebind
	and improve propagate_on_container_move_assignment check.

From-SVN: r193639
---
 libstdc++-v3/ChangeLog                                   | 5 +++++
 .../testsuite/20_util/allocator/requirements/typedefs.cc | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9636bd7f47f7..f96cf7a8e844 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-19  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* testsuite/20_util/allocator/requirements/typedefs.cc: Check rebind
+	and improve propagate_on_container_move_assignment check.
+
 2012-11-19  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* include/bits/stl_algo.h (reverse_copy): Update comment per DR 2074.
diff --git a/libstdc++-v3/testsuite/20_util/allocator/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/allocator/requirements/typedefs.cc
index 37d5032ad80b..78536de7b42d 100644
--- a/libstdc++-v3/testsuite/20_util/allocator/requirements/typedefs.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator/requirements/typedefs.cc
@@ -42,5 +42,10 @@ static_assert( is_same<allocator<int>::const_reference, const int&>::value,
 static_assert( is_same<allocator<int>::value_type, int>::value,
                "value_type" );
 
-static_assert( allocator<int>::propagate_on_container_move_assignment::value,
-               "propagate_on_container_move_assignment is true" );
+static_assert( is_same<allocator<int>::rebind<char>::other,
+                       allocator<char>>::value,
+               "rebind::other" );
+
+static_assert( is_same<allocator<int>::propagate_on_container_move_assignment,
+                       std::true_type>::value,
+               "propagate_on_container_move_assignment" );
-- 
GitLab