* cp-tree.h (get_aggr_typedef): Remove.

	* init.c (get_aggr_typedef): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84588 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5cc7894..b94b245 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-12  Mark Mitchell  <mark@codesourcery.com>
 
+       * cp-tree.h (get_aggr_typedef): Remove.
+       * init.c (get_aggr_typedef): Likewise.
+
        * name-lookup.c (push_class_level_binding): Simplify.
 
 2004-07-12  Andrew Pinski  <apinski@apple.com>

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index a8d6f04..3311bc0 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3860,7 +3860,6 @@ extern void emit_mem_initializers         (tree);
 extern tree build_aggr_init                    (tree, tree, int);
 extern tree build_init                         (tree, tree, int);
 extern int is_aggr_type                                (tree, int);
-extern tree get_aggr_from_typedef              (tree, int);
 extern tree get_type_value                     (tree);
 extern tree build_zero_init                    (tree, tree, bool);
 extern tree build_offset_ref                   (tree, tree, bool);

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 9b2a8f5..0fa2365 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1299,36 +1299,6 @@ is_aggr_type (tree type, int or_else)
   return 1;
 }
 
-/* Like is_aggr_typedef, but returns typedef if successful.  */
-
-tree
-get_aggr_from_typedef (tree name, int or_else)
-{
-  tree type;
-
-  if (name == error_mark_node)
-    return NULL_TREE;
-
-  if (IDENTIFIER_HAS_TYPE_VALUE (name))
-    type = IDENTIFIER_TYPE_VALUE (name);
-  else
-    {
-      if (or_else)
-       error ("`%T' fails to be an aggregate typedef", name);
-      return NULL_TREE;
-    }
-
-  if (! IS_AGGR_TYPE (type)
-      && TREE_CODE (type) != TEMPLATE_TYPE_PARM
-      && TREE_CODE (type) != BOUND_TEMPLATE_TEMPLATE_PARM)
-    {
-      if (or_else)
-       error ("type `%T' is of non-aggregate type", type);
-      return NULL_TREE;
-    }
-  return type;
-}
-
 tree
 get_type_value (tree name)
 {