diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-05-18 15:20:04 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-05-18 15:20:04 +0000 |
| commit | 2063b07f4de76afe602730fb51acd8aebbf5c1bd (patch) | |
| tree | 6cd1335dae35c94b970dea9f4c92d11dfdb74f19 /gcc/cp/tree.c | |
| parent | 8264c84d54602b4ced60ec0a969b58b2c9c5a944 (diff) | |
| download | gcc-2063b07f4de76afe602730fb51acd8aebbf5c1bd.zip gcc-2063b07f4de76afe602730fb51acd8aebbf5c1bd.tar.gz gcc-2063b07f4de76afe602730fb51acd8aebbf5c1bd.tar.bz2 | |
cp-tree.h (OVL_USED): Replace with ...
* cp-tree.h (OVL_USED): Replace with ...
(OVL_USING_P): ... this.
(ovl_iterator::using_p): Adjust.
* name-lookup.c (push_overloaded_decl_1)
do_nonmember_using_decl): Adjust.
* search.c (lookup_field_r): Adjust.
* tree.c (ovl_insert, ovl_scope): Adjust.
(--This line, and those below, will be ignored--
M cp/tree.c
M cp/cp-tree.h
M cp/name-lookup.c
M cp/search.c
M cp/ChangeLog
From-SVN: r248229
Diffstat (limited to 'gcc/cp/tree.c')
| -rw-r--r-- | gcc/cp/tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 4417f07..61254c0 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2138,7 +2138,7 @@ ovl_insert (tree fn, tree maybe_ovl, bool using_p) /* Find insertion point. */ while (maybe_ovl && TREE_CODE (maybe_ovl) == OVERLOAD - && (weight < OVL_USED (maybe_ovl))) + && (weight < OVL_USING_P (maybe_ovl))) { if (!result) result = maybe_ovl; @@ -2151,7 +2151,7 @@ ovl_insert (tree fn, tree maybe_ovl, bool using_p) { trail = ovl_make (fn, maybe_ovl); if (using_p) - OVL_USED (trail) = true; + OVL_USING_P (trail) = true; } if (insert_after) @@ -2290,7 +2290,7 @@ ovl_scope (tree ovl) if (TREE_CODE (ovl) == TEMPLATE_ID_EXPR) ovl = TREE_OPERAND (ovl, 0); /* Skip using-declarations. */ - while (TREE_CODE (ovl) == OVERLOAD && OVL_USED (ovl) && OVL_CHAIN (ovl)) + while (TREE_CODE (ovl) == OVERLOAD && OVL_USING_P (ovl) && OVL_CHAIN (ovl)) ovl = OVL_CHAIN (ovl); return CP_DECL_CONTEXT (OVL_CURRENT (ovl)); } |