diff options
| author | Jason Merrill <jason@redhat.com> | 2011-07-16 22:34:22 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-07-16 22:34:22 -0400 |
| commit | 6573e8a0a9a5242a30cafc7290e9d6449a8cee52 (patch) | |
| tree | a63c4991199e85d2676b29a436459f79f0374054 /libstdc++-v3 | |
| parent | 3d2f6864225cc660adfc9136c859dd26e2a40135 (diff) | |
| download | gcc-6573e8a0a9a5242a30cafc7290e9d6449a8cee52.zip gcc-6573e8a0a9a5242a30cafc7290e9d6449a8cee52.tar.gz gcc-6573e8a0a9a5242a30cafc7290e9d6449a8cee52.tar.bz2 | |
pt.c (tinst_level_tick, [...]): Replace with last_error_tinst_level.
gcc/cp/
* pt.c (tinst_level_tick, last_template_error_tick): Replace with
last_error_tinst_level.
(push_tinst_level, pop_tinst_level): Adjust.
(problematic_instantiation_changed): Adjust.
(record_last_problematic_instantiation): Adjust.
* error.c (cp_print_error_function): Don't print
current_function_decl if we're in a template instantiation context.
(print_instantiation_full_context): Always print first line.
gcc/testsuite/
* lib/prune.exp (prune_gcc_output): Prune "In substitution" too.
From-SVN: r176366
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc index a56148a..a884d01 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc @@ -47,6 +47,6 @@ main() test01(); return 0; } -// { dg-error "In member function" "" { target *-*-* } 0 } +// { dg-error "In instantiation" "" { target *-*-* } 0 } // { dg-error "cannot convert" "" { target *-*-* } 0 } // { dg-error "required from" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc index 8114531..ec41e5b 100644 --- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc +++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc @@ -46,6 +46,6 @@ main() test01(); return 0; } -// { dg-error "In member function" "" { target *-*-* } 0 } +// { dg-error "In instantiation" "" { target *-*-* } 0 } // { dg-error "cannot convert" "" { target *-*-* } 0 } // { dg-error "required from" "" { target *-*-* } 0 } |