diff options
| author | Mike Stump <mrs@apple.com> | 2006-05-02 01:04:46 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2006-05-02 01:04:46 +0000 |
| commit | 60b72337785a4448e99b8b3362d985a63e6370ef (patch) | |
| tree | d03d9d5901ec8f1af0a3a165a0bda77ce9fc42d6 /gcc/cp/typeck.c | |
| parent | a58592bcf8b29b799ce0532e968d1f1d11059b18 (diff) | |
Merged -r112764:113438 branches/apple-local-200502-branch.apple/gcc-5402
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple/trunk@113449 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/typeck.c')
| -rw-r--r-- | gcc/cp/typeck.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 8915c62d0d4..cd7c3665c45 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -2768,7 +2768,7 @@ build_x_binary_op (enum tree_code code, tree arg1, tree arg2, /* APPLE LOCAL begin CW asm blocks */ /* I think this is dead now. */ - if (inside_cw_asm_block) + if (inside_iasm_block) if (TREE_CODE (arg1) == IDENTIFIER_NODE || TREE_CODE (arg2) == IDENTIFIER_NODE || TREE_TYPE (arg1) == NULL_TREE @@ -6914,7 +6914,7 @@ non_reference (tree t) /* APPLE LOCAL begin CW asm blocks */ tree -cw_asm_cp_build_component_ref (tree datum, tree component) +iasm_cp_build_component_ref (tree datum, tree component) { tree expr = finish_class_member_access_expr (datum, component); /* If this is not a real component reference, extract the field |