From 3579964bee6f4b621322d367de1fa6ce4b36befc Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 22 Apr 2013 16:40:54 -0400 Subject: pt.c (fn_type_unification): Push tinst level around type_unification_real if we aren't explaining. gcc/cp/ * pt.c (fn_type_unification): Push tinst level around type_unification_real if we aren't explaining. * cp-tree.h (TFF_NO_TEMPLATE_BINDINGS): New. * error.c (dump_function_decl): Respect it. (subst_to_string): Pass it. libstdc++-v3/ * testsuite/lib/prune.exp (libstdc++-dg-prune): Also ignore "In substitution" lines. From-SVN: r198161 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/testsuite/lib/prune.exp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b44f584..ec91a24 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2013-04-22 Jason Merrill + * testsuite/lib/prune.exp (libstdc++-dg-prune): Also ignore "In + substitution" lines. + * testsuite/20_util/is_assignable/value.cc: Comment out tests involving function-cv-quals. * testsuite/20_util/is_constructible/value-2.cc: Likewise. diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp index b17fa00..6ed3efb 100644 --- a/libstdc++-v3/testsuite/lib/prune.exp +++ b/libstdc++-v3/testsuite/lib/prune.exp @@ -42,7 +42,7 @@ proc libstdc++-dg-prune { system text } { # Remove parts of warnings that refer to location of previous # definitions, etc as these confuse dejagnu - 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 -- cgit v1.1