diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-05-11 17:38:55 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-05-11 17:38:55 +0000 |
| commit | 4f15a5da6f41bec5eced2956cb3f2e098ec8d77b (patch) | |
| tree | efc7463bec84070e699dc61f8cffd14e12e1d647 /gcc/cp/pt.c | |
| parent | 59fbddcfff234b2f074288b92da7523c11d23aa0 (diff) | |
| download | gcc-4f15a5da6f41bec5eced2956cb3f2e098ec8d77b.zip gcc-4f15a5da6f41bec5eced2956cb3f2e098ec8d77b.tar.gz gcc-4f15a5da6f41bec5eced2956cb3f2e098ec8d77b.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |