revert

From-SVN: r28586

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bfebb6e241b9c0e1f0d5c201fea2630fe3b7b0a6..9269af0ab568d16cbb3abf5999a00fedbc5a8d43 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,9 +3,6 @@
        * 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 e6209f906820164363644eb84d867c878471607f..0a4e20693d595efb3115e0c5ed30b2ca718b85be 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3574,7 +3574,6 @@ maybe_get_template_decl_from_type_decl (decl)
   return (decl != NULL_TREE
          && TREE_CODE (decl) == TYPE_DECL 
          && DECL_ARTIFICIAL (decl)
-         && CLASS_TYPE_P (decl)
          && CLASSTYPE_TEMPLATE_INFO (TREE_TYPE (decl))) 
     ? CLASSTYPE_TI_TEMPLATE (TREE_TYPE (decl)) : decl;
 }