objcp-decl.c (objcp_start_struct, [...]): Adjust call to xref_tag().

        * objcp-decl.c (objcp_start_struct, objcp_xref_tag): Adjust
        call to xref_tag().
        (objcp_build_component_ref): Remove function.
        * objcp-decl.h (objcp_build_component_ref): Remove prototype.
        (build_component_ref): Remove macro.
        * objcp-lang.c (LANG_HOOKS_TYPES_COMPATIBLE_P): Remove.

From-SVN: r100122

4 files changed, 13 insertions, 16 deletions

diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index 73a5410..f80405f 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-24  Ziemowit Laski  <zlaski@apple.com>
+
+	* objcp-decl.c (objcp_start_struct, objcp_xref_tag): Adjust
+	call to xref_tag().
+	(objcp_build_component_ref): Remove function.
+	* objcp-decl.h (objcp_build_component_ref): Remove prototype.
+	(build_component_ref): Remove macro.
+	* objcp-lang.c (LANG_HOOKS_TYPES_COMPATIBLE_P): Remove.
+
 2005-05-18  Geoffrey Keating  <geoffk@apple.com>
 
 	* Make-lang.in (cc1objplus-dummy): New.
diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c
index 7493a23..68bcb0f 100644
--- a/gcc/objcp/objcp-decl.c
+++ b/gcc/objcp/objcp-decl.c
@@ -51,9 +51,11 @@ objcp_start_struct (enum tree_code code ATTRIBUTE_UNUSED, tree name)
   /* The idea here is to mimic the actions that the C++ parser takes when
      constructing 'extern "C" struct NAME {'.  */
   push_lang_context (lang_name_c);
+
   if (!name)
     name = make_anon_name ();
-  s = xref_tag (record_type, name, ts_current, 0);
+
+  s = xref_tag (record_type, name, ts_global, 0);
   CLASSTYPE_DECLARED_CLASS (s) = 0;  /* this is a 'struct', not a 'class'.  */
   xref_basetypes (s, NULL_TREE);     /* no base classes here!  */
 
@@ -94,16 +96,7 @@ objcp_lookup_name (tree name)
 tree
 objcp_xref_tag (enum tree_code code ATTRIBUTE_UNUSED, tree name)
 {
-  return xref_tag (record_type, name, true, false);
-}
-
-tree
-objcp_build_component_ref (tree datum, tree component)
-{
-  /* The 'build_component_ref' routine has been removed from the C++
-     front-end, but 'finish_class_member_access_expr' seems to be
-     a worthy substitute.  */
-  return finish_class_member_access_expr (datum, component);
+  return xref_tag (record_type, name, ts_global, false);
 }
 
 int
diff --git a/gcc/objcp/objcp-decl.h b/gcc/objcp/objcp-decl.h
index 39cad46..a6b14b7 100644
--- a/gcc/objcp/objcp-decl.h
+++ b/gcc/objcp/objcp-decl.h
@@ -29,7 +29,6 @@ extern void objcp_finish_function (void);
 extern tree objcp_lookup_name (tree);
 extern tree objcp_build_function_call (tree, tree);
 extern tree objcp_xref_tag (enum tree_code, tree);
-extern tree objcp_build_component_ref (tree, tree);
 extern int objcp_comptypes (tree, tree);
 extern tree objcp_builtin_function (const char *, tree, int, 
 				    enum built_in_class, const char *, tree);
@@ -51,8 +50,6 @@ extern tree objcp_end_compound_stmt (tree, int);
 	objcp_lookup_name (name)
 #define xref_tag(code, name) \
 	objcp_xref_tag (code, name)
-#define build_component_ref(datum, component) \
-        objcp_build_component_ref (datum, component)
 #define comptypes(type1, type2) \
 	objcp_comptypes (type1, type2)
 #define c_begin_compound_stmt(flags) \
diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c
index 63f1953..7f2b6e1 100644
--- a/gcc/objcp/objcp-lang.c
+++ b/gcc/objcp/objcp-lang.c
@@ -46,8 +46,6 @@ enum c_language_kind c_language = clk_objcxx;
 #define LANG_HOOKS_INIT objc_init
 #undef LANG_HOOKS_DECL_PRINTABLE_NAME
 #define LANG_HOOKS_DECL_PRINTABLE_NAME	objc_printable_name
-#undef LANG_HOOKS_TYPES_COMPATIBLE_P
-#define LANG_HOOKS_TYPES_COMPATIBLE_P objc_types_compatible_p
 #undef LANG_HOOKS_GIMPLIFY_EXPR 
 #define LANG_HOOKS_GIMPLIFY_EXPR objc_gimplify_expr
 #undef LANG_HOOKS_GET_CALLEE_FNDECL