diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-09-13 11:45:56 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-09-13 11:45:56 +0000 |
| commit | 783dc7392a04bde7bbf6806d55484f3ab37b62db (patch) | |
| tree | a07513d82a503f550f7d9339094e7fe31d8d15d9 /gcc/cp/search.c | |
| parent | 491cefb7ea5dc035b2ee5b706aa21efcd49d76c3 (diff) | |
| download | gcc-783dc7392a04bde7bbf6806d55484f3ab37b62db.zip gcc-783dc7392a04bde7bbf6806d55484f3ab37b62db.tar.gz gcc-783dc7392a04bde7bbf6806d55484f3ab37b62db.tar.bz2 | |
Rename CLASSTYPE_METHOD_VEC to CLASSTYPE_MEMBER_VEC.
* cp-tree.h (struct lang_type): Rename methods to members.
(CLASSTYPE_METHOD_VEC): Rename to ...
(CLASSTYPE_MEMBER_VEC): ... this.
* name-lookup.h (get_method_slot): Rename to ...
(get_member_slot): ... this.
(resort_type_method_vec): Rename to ...
(resort_type_member_vec): ... this.
* class.c (add_method, warn_hidden): Adjust.
* search.c (dfs_locate_field_accessor_pre): Adjust.
* name-lookup.c (method_vec_binary_search): Rename to ...
(member_vec_binary_search): ... this and adjust.
(method_vec_linear_search): Rename to ...
(member_vec_linear_search): ... this and adjust.
(fields_linear_search, get_class_binding_direct): Adjust.
(get_method_slot): Rename to ...
(get_member_slot): ... this and adjust.
(method_name_slot): Rename to ...
(member_name_slot): ... this and adjust.
(resort_type_method_vec): Rename to ...
(resort_type_member_vec): ... this and adjust.
(method_vec_append_class_fields): Rename to ...
(member_vec_append_class_fields): ... this and adjust.
(method_vec_append_enum_values): Rename to ...
(member_vec_append_enum_values): ... this and adjust.
(method_vec_dedup): Rename to ...
(member_vec_dedup): ... this and adjust.
(set_class_bindings, insert_late_enum_def_bindings): Adjust.
From-SVN: r252078
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 11e721f..1de04f2 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1803,18 +1803,18 @@ dfs_locate_field_accessor_pre (tree binfo, void *data) locate_field_data *lfd = (locate_field_data *)data; tree type = BINFO_TYPE (binfo); - vec<tree, va_gc> *method_vec; + vec<tree, va_gc> *member_vec; tree fn; size_t i; if (!CLASS_TYPE_P (type)) return NULL_TREE; - method_vec = CLASSTYPE_METHOD_VEC (type); - if (!method_vec) + member_vec = CLASSTYPE_MEMBER_VEC (type); + if (!member_vec) return NULL_TREE; - for (i = 0; vec_safe_iterate (method_vec, i, &fn); ++i) + for (i = 0; vec_safe_iterate (member_vec, i, &fn); ++i) if (fn) if (field_accessor_p (fn, lfd->field_decl, lfd->const_p)) return fn; |