diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-12 17:34:55 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-12 17:34:55 +0000 |
| commit | db0e6c680912e8af44b145970e74aacb199ffb32 (patch) | |
| tree | 2313d89c18902359a7691d09beab1a87f30f42a9 /libstdc++-v3 | |
| parent | 0d836813e192373f9b1485e50823a4f64136a5d2 (diff) | |
| download | gcc-db0e6c680912e8af44b145970e74aacb199ffb32.tar.gz | |
PR c++/20669
* call.c (add_template_candidate_real): If deduction fails, still
add the template as a non-viable candidate.
(equal_functions): Handle template candidates.
(print_z_candidate): Likewise.
(print_z_candidates): Likewise.
(build_new_function_call): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159335 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
4 files changed, 19 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 903f371fa62..ae20b119cf4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2010-05-12 Jason Merrill <jason@redhat.com> + + * testsuite/20_util/auto_ptr/assign_neg.cc: Expect template + candidate messages. + * testsuite/20_util/unique_ptr/assign/assign_neg.cc: Likewise. + * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise. + 2010-05-11 Silvius Rus <silvius.rus@gmail.com> PR libstdc++/43259 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 b4b9eb910a6..1f6e67394e9 100644 --- a/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc +++ b/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc @@ -47,4 +47,5 @@ main() return 0; } // { dg-error "candidates" "" { target *-*-* } 134 } +// { dg-error "note" "" { target *-*-* } 152 } // { dg-error "::auto_ptr" "" { 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 525364b3412..4aa93b91d91 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 @@ -52,7 +52,8 @@ test03() // { dg-error "deleted function" "" { target *-*-* } 357 } // { dg-error "used here" "" { target *-*-* } 42 } // { dg-error "no matching" "" { target *-*-* } 48 } -// { dg-warning "candidates are" "" { target *-*-* } 130 } +// { dg-warning "note" "" { target *-*-* } 130 } +// { dg-warning "note" "" { target *-*-* } 134 } // { dg-warning "note" "" { target *-*-* } 123 } // { dg-warning "note" "" { target *-*-* } 118 } // { dg-warning "note" "" { target *-*-* } 113 } 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 93aceb305eb..6165db09df7 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 @@ -40,3 +40,12 @@ main() test01(); return 0; } + +// { dg-warning "note" "" { target *-*-* } 281 } +// { dg-warning "note" "" { target *-*-* } 407 } +// { dg-warning "note" "" { target *-*-* } 831 } +// { dg-warning "note" "" { target *-*-* } 511 } +// { dg-warning "note" "" { target *-*-* } 1005 } +// { dg-warning "note" "" { target *-*-* } 340 } +// { dg-warning "note" "" { target *-*-* } 290 } +// { dg-warning "note" "" { target *-*-* } 190 } |