2010-04-24 Jonathan Wakely <jwakely.gcc@gmail.com>

	* include/bits/unique_ptr (unique_ptr::pointer): Use deleter's
	pointer type if it exists.
	* testsuite/20_util/unique_ptr/requirements/pointer_type.cc: New.
	* testsuite/20_util/unique_ptr/assign/assign_neg.cc: Adjust.
	* testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158682 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 96d166f..e722192 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-24  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * include/bits/unique_ptr (unique_ptr::pointer): Use deleter's
+       pointer type if it exists.
+       * testsuite/20_util/unique_ptr/requirements/pointer_type.cc: New.
+       * testsuite/20_util/unique_ptr/assign/assign_neg.cc: Adjust.
+       * testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Adjust.
+
 2010-04-22  Johannes Singler  <singler@kit.edu>
 
         * include/parallel/partition.h (__parallel_partition):

diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc
index 4aa93b9..525364b 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc
@@ -52,8 +52,7 @@ test03()
 // { dg-error "deleted function" "" { target *-*-* } 357 }
 // { dg-error "used here" "" { target *-*-* } 42 }
 // { dg-error "no matching" "" { target *-*-* } 48 }
-// { dg-warning "note" "" { target *-*-* } 130 }
-// { dg-warning "note" "" { target *-*-* } 134 }
+// { dg-warning "candidates are" "" { target *-*-* } 130 }
 // { dg-warning "note" "" { target *-*-* } 123 }
 // { dg-warning "note" "" { target *-*-* } 118 }
 // { dg-warning "note" "" { target *-*-* } 113 }