From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 18 Mar 1998 12:42:05 +0000 (+0000)
Subject: decl.c (make_implicit_typename): Only change the type of a TYPENAME_TYPE.
X-Git-Tag: prereleases/egcs-1.1-prerelease~2058
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74ef3b26f3efc6b3c36aaf2bad21f035c8aa3ad1;p=thirdparty%2Fgcc.git

decl.c (make_implicit_typename): Only change the type of a TYPENAME_TYPE.

	* decl.c (make_implicit_typename): Only change the type of a
	TYPENAME_TYPE.

From-SVN: r18668
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 723c5a2f3650..b8269f39eb89 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 18 12:41:43 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* decl.c (make_implicit_typename): Only change the type of a 
+	TYPENAME_TYPE.
+
 Wed Mar 18 10:09:51 1998  Mark Mitchell  <mmitchell@usa.net>
 
 	* semantics.c: New file, containing routines to perform the
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 4c33191a705f..80fc95922923 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4592,8 +4592,9 @@ make_implicit_typename (context, t)
     }
   else
     retval = make_typename_type (context, DECL_NAME (t));
-  
-  TREE_TYPE (retval) = TREE_TYPE (t);
+
+  if (TREE_CODE (retval) == TYPENAME_TYPE)
+    TREE_TYPE (retval) = TREE_TYPE (t);
   return retval;
 }