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/sig.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/sig.c')
| -rw-r--r-- | gcc/cp/sig.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/cp/sig.c b/gcc/cp/sig.c index 2a5efcd..9d2322d 100644 --- a/gcc/cp/sig.c +++ b/gcc/cp/sig.c @@ -400,8 +400,8 @@ match_method_types (sig_mtype, class_mtype) /* Compare the first argument `this.' */ { /* Get the type of what the `optr' is pointing to. */ - tree sig_this = - TREE_TYPE (TREE_TYPE (TYPE_FIELDS (TREE_VALUE (sig_arg_types)))); + tree sig_this + = TREE_TYPE (TREE_TYPE (TYPE_FIELDS (TREE_VALUE (sig_arg_types)))); tree class_this = TREE_VALUE (class_arg_types); if (TREE_CODE (class_this) == RECORD_TYPE) /* Is `this' a sig ptr? */ @@ -790,9 +790,9 @@ build_signature_pointer_constructor (lhs, rhs) if (! ((TREE_CODE (rhstype) == POINTER_TYPE && TREE_CODE (TREE_TYPE (rhstype)) == RECORD_TYPE) - || (TYPE_LANG_SPECIFIC (rhstype) && - (IS_SIGNATURE_POINTER (rhstype) - || IS_SIGNATURE_REFERENCE (rhstype))))) + || (TYPE_LANG_SPECIFIC (rhstype) + && (IS_SIGNATURE_POINTER (rhstype) + || IS_SIGNATURE_REFERENCE (rhstype))))) { error ("invalid assignment to signature pointer or reference"); return error_mark_node; @@ -814,8 +814,8 @@ build_signature_pointer_constructor (lhs, rhs) saveable_obstack = &permanent_obstack; } - if (TYPE_LANG_SPECIFIC (rhstype) && - (IS_SIGNATURE_POINTER (rhstype) || IS_SIGNATURE_REFERENCE (rhstype))) + if (TYPE_LANG_SPECIFIC (rhstype) + && (IS_SIGNATURE_POINTER (rhstype) || IS_SIGNATURE_REFERENCE (rhstype))) { if (SIGNATURE_TYPE (rhstype) == sig_ty) { @@ -968,10 +968,10 @@ build_signature_method_call (function, parms) /* Cast the signature method to have `this' of a normal pointer type. */ tree old_this = TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (TREE_TYPE (pfn)))); - TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (TREE_TYPE (pfn)))) = - build_type_variant (build_pointer_type (basetype), - TYPE_READONLY (old_this), - TYPE_VOLATILE (old_this)); + TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (TREE_TYPE (pfn)))) + = build_type_variant (build_pointer_type (basetype), + TYPE_READONLY (old_this), + TYPE_VOLATILE (old_this)); direct_call = build_function_call (pfn, new_parms); |