diff options
| author | Mike Stump <mrs@gcc.gnu.org> | 1997-05-28 23:20:02 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 1997-05-28 23:20:02 +0000 |
| commit | 37c46b43dba86b48bb19d9f7ed231385e02c1abd (patch) | |
| tree | 1eb8dc109639b3bbe2e0cb0199cf3ff635b2481b /gcc/cp/class.c | |
| parent | 87c166683a971ac241f06423db6af2b45d1c39ed (diff) | |
| download | gcc-37c46b43dba86b48bb19d9f7ed231385e02c1abd.zip gcc-37c46b43dba86b48bb19d9f7ed231385e02c1abd.tar.gz gcc-37c46b43dba86b48bb19d9f7ed231385e02c1abd.tar.bz2 | |
91th Cygnus<->FSF quick merge
From-SVN: r14134
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 44483c0..37cdb6b 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -322,8 +322,11 @@ build_vbase_path (code, type, expr, path, alias_this) if (TREE_INT_CST_LOW (offset)) { /* Bash types to make the backend happy. */ - offset = convert (type, offset); + offset = cp_convert (type, offset); +#if 0 + /* This shouldn't be necessary. (mrs) */ expr = build1 (NOP_EXPR, type, expr); +#endif /* For multiple inheritance: if `this' can be set by any function, then it could be 0 on entry to any function. @@ -518,8 +521,8 @@ build_vfn_ref (ptr_to_instptr, instance, idx) *ptr_to_instptr = build (PLUS_EXPR, TREE_TYPE (*ptr_to_instptr), *ptr_to_instptr, - convert (ptrdiff_type_node, - build_component_ref (aref, delta_identifier, NULL_TREE, 0))); + cp_convert (ptrdiff_type_node, + build_component_ref (aref, delta_identifier, NULL_TREE, 0))); } return build_component_ref (aref, pfn_identifier, NULL_TREE, 0); @@ -4630,8 +4633,10 @@ pushclass (type, modify) pushlevel_class (); +#if 0 if (CLASSTYPE_TEMPLATE_INFO (type)) overload_template_name (type); +#endif if (modify) { |