From 4f15a5da6f41bec5eced2956cb3f2e098ec8d77b Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 11 May 2017 17:38:55 +0000 Subject: name-lookup.h (pushdecl): Add default friend parm. * name-lookup.h (pushdecl): Add default friend parm. (pushdecl_maybe_friend): Delete. (pushdecl_top_level): Add default friend parm. (pushdecl_top_level_maybe_friend): Delete. * name-lookup.c (pushdecl_maybe_friend): Delete. (pushdecl): Add is_friend parm. (pushdecl_top_level): Add is friend_parm. (pushdecl_top_level_maybe_friend, pushdecl_top_level_1): Delete. (pushdecl_top_level_and_finish): Do pushing and finishing directly. * friend.c (do_friend): Adjust. * pt.c (tsubst_friend_class): Adjust. From-SVN: r247918 --- gcc/cp/pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/cp/pt.c') diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5f7d429..e7e2aa6 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9920,7 +9920,7 @@ tsubst_friend_class (tree friend_tmpl, tree args) = INNERMOST_TEMPLATE_ARGS (CLASSTYPE_TI_ARGS (TREE_TYPE (tmpl))); /* Inject this template into the global scope. */ - friend_type = TREE_TYPE (pushdecl_top_level_maybe_friend (tmpl, true)); + friend_type = TREE_TYPE (pushdecl_top_level (tmpl, true)); } if (context != global_namespace) -- cgit v1.1