From: Jason Merrill <jason@yorick.cygnus.com>
Date: Sun, 8 Aug 1999 21:03:59 +0000 (+0000)
Subject: fix thinko in last change
X-Git-Tag: releases/gcc-2.95.1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fc5a85565435adc86b9e47d64a015d6dc559e55;p=thirdparty%2Fgcc.git

fix thinko in last change

From-SVN: r28600
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9269af0ab568..bfebb6e241b9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,6 +3,9 @@
 	* decl.c (bad_specifiers): It's OK to have an EH spec on a function
 	pointer.
 
+	* pt.c (maybe_get_template_decl_from_type_decl): Make sure that
+	we're looking at a class.
+
 	* decl.c (lookup_name_real): Set the complain flag if we're
 	looking for a namespace member.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 0a4e20693d59..47fa99a5c431 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3574,6 +3574,7 @@ maybe_get_template_decl_from_type_decl (decl)
   return (decl != NULL_TREE
 	  && TREE_CODE (decl) == TYPE_DECL 
 	  && DECL_ARTIFICIAL (decl)
+	  && CLASS_TYPE_P (TREE_TYPE (decl))
 	  && CLASSTYPE_TEMPLATE_INFO (TREE_TYPE (decl))) 
     ? CLASSTYPE_TI_TEMPLATE (TREE_TYPE (decl)) : decl;
 }