From 61c33fc9ab58fff6349ed323f21a1021aefd3b5e Mon Sep 17 00:00:00 2001
From: froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 9 Dec 2010 04:34:20 +0000
Subject: [PATCH 1/1] 	PR testsuite/46860 	*
 testsuite/20_util/auto_ptr/assign_neg.cc: Adjust. 	*
 testsuite/20_util/unique_ptr/assign/assign_neg.cc: Adjust. 	*
 testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167625 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog                                         | 7 +++++++
 libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc          | 5 +++--
 libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc | 1 +
 libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc  | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ed2b11d6d7a..2f7f245c78a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-08  Nathan Froyd  <froydnj@codesourcery.com>
+
+	PR testsuite/46860
+	* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust.
+	* testsuite/20_util/unique_ptr/assign/assign_neg.cc: Adjust.
+	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust.
+
 2010-12-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/bitset (_Base_bitset<>::_Base_bitset(),
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc
index 1f6e67394e9..0fea060d7e5 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc
@@ -37,6 +37,7 @@ test01()
 {
   std::auto_ptr<Base> ptr2;
   ptr2 = new Base; // { dg-error "no match" }
+  // { dg-error "candidate" "candidate note" { target *-*-* } 39 }
   return 0;
 }
 
@@ -46,6 +47,6 @@ main()
   test01();
   return 0;
 }
-// { dg-error "candidates" "" { target *-*-* } 134 } 
+// { dg-error "::auto_ptr|no known conversion" "" { target *-*-* } 134 } 
 // { dg-error "note" "" { target *-*-* } 152 }
-// { dg-error "::auto_ptr" "" { target *-*-* } 262 } 
+// { dg-error "::auto_ptr|no known conversion" "" { target *-*-* } 262 } 
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 95c1d5dc5ba..501bad385e2 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc
@@ -46,6 +46,7 @@ void
 test03()
 {
   std::unique_ptr<int[2]> p1(new int[3]); // { dg-error "no match" }
+  // { dg-error "candidate" "candidate-note" { target *-*-* } 48 }
   std::unique_ptr<int[2]> p2 = p1; // { dg-error "deleted" }
 }
 
diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
index 019f5f7f592..c26b09dcec8 100644
--- a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
@@ -31,6 +31,7 @@ test01()
 {
   std::weak_ptr<A> p1;
   p1 < p1;  // { dg-error "no match" }
+  // { dg-error "candidate" "candidate note" { target *-*-* } 33 }
   return 0;
 }
 
-- 
2.11.0