diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1997-05-06 20:14:14 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 1997-05-06 20:14:14 +0000 |
| commit | beb53fb84a96ecfc7b5f207df6ed13014ec23a9d (patch) | |
| tree | ebe6e9cdaf48b8ffa8ac8c4a3fa3e9596e317942 /gcc/cp/search.c | |
| parent | 065bbfe6bf8a705bcfa5a7396559ac6e1660d7e6 (diff) | |
| download | gcc-beb53fb84a96ecfc7b5f207df6ed13014ec23a9d.zip gcc-beb53fb84a96ecfc7b5f207df6ed13014ec23a9d.tar.gz gcc-beb53fb84a96ecfc7b5f207df6ed13014ec23a9d.tar.bz2 | |
91th Cygnus<->FSF quick merge
From-SVN: r14021
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index f5f372c..fa69754 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -245,9 +245,9 @@ static struct memoized_entry * my_new_memoized_entry (chain) struct memoized_entry *chain; { - struct memoized_entry *p = - (struct memoized_entry *)obstack_alloc (&type_obstack_entries, - sizeof (struct memoized_entry)); + struct memoized_entry *p + = (struct memoized_entry *)obstack_alloc (&type_obstack_entries, + sizeof (struct memoized_entry)); bzero ((char *) p, sizeof (struct memoized_entry)); MEMOIZED_CHAIN (p) = chain; MEMOIZED_UID (p) = ++my_memoized_entry_counter; @@ -854,9 +854,9 @@ compute_access (basetype_path, field) /* Replaces static decl above. */ tree previous_scope; #endif - int static_mem = - ((TREE_CODE (field) == FUNCTION_DECL && DECL_STATIC_FUNCTION_P (field)) - || (TREE_CODE (field) != FUNCTION_DECL && TREE_STATIC (field))); + int static_mem + = ((TREE_CODE (field) == FUNCTION_DECL && DECL_STATIC_FUNCTION_P (field)) + || (TREE_CODE (field) != FUNCTION_DECL && TREE_STATIC (field))); if (! flag_access_control) return access_public_node; @@ -2182,8 +2182,8 @@ get_abstract_virtuals_1 (binfo, do_self, abstract_virtuals) for (i = 0; i < n_baselinks; i++) { tree base_binfo = TREE_VEC_ELT (binfos, i); - int is_not_base_vtable = - i != CLASSTYPE_VFIELD_PARENT (BINFO_TYPE (binfo)); + int is_not_base_vtable + = i != CLASSTYPE_VFIELD_PARENT (BINFO_TYPE (binfo)); if (! TREE_VIA_VIRTUAL (base_binfo)) abstract_virtuals = get_abstract_virtuals_1 (base_binfo, is_not_base_vtable, @@ -2887,8 +2887,8 @@ fixup_virtual_upcast_offsets (real_binfo, binfo, init_self, can_elide, addr, ori { tree real_base_binfo = TREE_VEC_ELT (real_binfos, i); tree base_binfo = TREE_VEC_ELT (binfos, i); - int is_not_base_vtable = - i != CLASSTYPE_VFIELD_PARENT (BINFO_TYPE (real_binfo)); + int is_not_base_vtable + = i != CLASSTYPE_VFIELD_PARENT (BINFO_TYPE (real_binfo)); if (! TREE_VIA_VIRTUAL (real_base_binfo)) fixup_virtual_upcast_offsets (real_base_binfo, base_binfo, is_not_base_vtable, can_elide, addr, |