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 /gcc/testsuite/lib/prune.exp | |
| 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 'gcc/testsuite/lib/prune.exp')
| -rw-r--r-- | gcc/testsuite/lib/prune.exp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index f5cbc4c..4683f93 100644 --- a/gcc/testsuite/lib/prune.exp +++ b/gcc/testsuite/lib/prune.exp @@ -20,7 +20,7 @@ proc prune_gcc_output { text } { #send_user "Before:$text\n" - regsub -all "(^|\n)(\[^\n\]*: )?In ((static member |lambda )?function|member|method|(copy )?constructor|destructor|instantiation|program|subroutine|block-data)\[^\n\]*" $text "" text + regsub -all "(^|\n)(\[^\n\]*: )?In ((static member |lambda )?function|member|method|(copy )?constructor|destructor|instantiation|substitution|program|subroutine|block-data)\[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*(: )?At (top level|global scope):\[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*: (recursively )?required \[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*: . skipping \[0-9\]* instantiation contexts \[^\n\]*" $text "" text |