diff options
| author | Nathan Froyd <froydnj@codesourcery.com> | 2010-12-09 04:34:20 +0000 |
|---|---|---|
| committer | Nathan Froyd <froydnj@gcc.gnu.org> | 2010-12-09 04:34:20 +0000 |
| commit | ad632e9801d01d051507053ac1db7cd393d973b2 (patch) | |
| tree | ef5b097cb5f61d9bd0ccbd39288aaf9d8fe37aa7 | |
| parent | b6710d1a510849072141b87eade27949ff0f207a (diff) | |
| download | gcc-ad632e9801d01d051507053ac1db7cd393d973b2.zip gcc-ad632e9801d01d051507053ac1db7cd393d973b2.tar.gz gcc-ad632e9801d01d051507053ac1db7cd393d973b2.tar.bz2 | |
re PR testsuite/46860 (New libstdc++ failures)
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.
From-SVN: r167625
4 files changed, 12 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ed2b11d..2f7f245 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 1f6e673..0fea060 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 95c1d5d..501bad3 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 019f5f7..c26b09d 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; } |