From: Nathan Sidwell <nathan@acm.org>
Date: Tue, 3 Aug 1999 14:45:20 +0000 (+0000)
Subject: * class.c (duplicate_tag_error): Preserve template information.
X-Git-Tag: prereleases/libstdc++-2.92~11362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13bd123dfbe7b4df76cd1e20a88d592c639eabe4;p=thirdparty%2Fgcc.git

* class.c (duplicate_tag_error): Preserve template information.

From-SVN: r28473
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 94d0b96c25ef..5f589da7375d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-03  Nathan Sidwell  <nathan@acm.org>
+
+	* class.c (duplicate_tag_error): Preserve template information.
+
 1999-08-03  Nathan Sidwell  <nathan@acm.org>
 
 	* decl.c (start_enum): Show location of previous definition.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 4373f1394903..78ed03269e6d 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -2205,6 +2205,8 @@ duplicate_tag_error (t)
       tree binfo = TYPE_BINFO (t);
       int interface_only = CLASSTYPE_INTERFACE_ONLY (t);
       int interface_unknown = CLASSTYPE_INTERFACE_UNKNOWN (t);
+      tree template_info = CLASSTYPE_TEMPLATE_INFO (t);
+      int use_template = CLASSTYPE_USE_TEMPLATE (t);
 
       bzero ((char *) TYPE_LANG_SPECIFIC (t), sizeof (struct lang_type));
       BINFO_BASETYPES(binfo) = NULL_TREE;
@@ -2213,6 +2215,8 @@ duplicate_tag_error (t)
       CLASSTYPE_INTERFACE_ONLY (t) = interface_only;
       SET_CLASSTYPE_INTERFACE_UNKNOWN_X (t, interface_unknown);
       TYPE_REDEFINED (t) = 1;
+      CLASSTYPE_TEMPLATE_INFO (t) = template_info;
+      CLASSTYPE_USE_TEMPLATE (t) = use_template;
     }
   TYPE_SIZE (t) = NULL_TREE;
   TYPE_MODE (t) = VOIDmode;