diff options
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 266d8dd..38be467 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -978,7 +978,7 @@ lookup_field_r (tree binfo, void *data) member with the same name, and if there's a function and a type with the same name, the type is hidden by the function. */ if (!lfi->want_type) - nval = lookup_fnfields_slot (type, lfi->name); + nval = get_class_binding (type, lfi->name); if (!nval) /* Look for a data member or type. */ @@ -2048,7 +2048,7 @@ look_for_overrides (tree type, tree fndecl) tree look_for_overrides_here (tree type, tree fndecl) { - tree ovl = lookup_fnfields_slot (type, DECL_NAME (fndecl)); + tree ovl = get_class_binding (type, DECL_NAME (fndecl)); for (ovl_iterator iter (ovl); iter; ++iter) { @@ -2370,8 +2370,7 @@ lookup_conversions_r (tree binfo, int virtual_depth, int virtualness, virtual_depth++; /* First, locate the unhidden ones at this level. */ - tree conv = lookup_fnfields_slot_nolazy (BINFO_TYPE (binfo), - conv_op_identifier); + if (tree conv = get_class_binding (BINFO_TYPE (binfo), conv_op_identifier)) for (ovl_iterator iter (conv); iter; ++iter) { tree fn = *iter; |