From: Jason Merrill <jason@redhat.com>
Date: Fri, 6 Jul 2012 14:00:44 +0000 (-0400)
Subject: * cp-tree.h (DECL_DECLARES_TYPE_P): Check DECL_TYPE_TEMPLATE_P.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df947b0a640b9c8306e4ef0a64a330df9f82b46e;p=gcc.git

* cp-tree.h (DECL_DECLARES_TYPE_P): Check DECL_TYPE_TEMPLATE_P.

From-SVN: r189332
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 58010047555..0bd2c77513d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-06  Jason Merrill  <jason@redhat.com>
 
+	* cp-tree.h (DECL_DECLARES_TYPE_P): Check DECL_TYPE_TEMPLATE_P.
+
 	PR c++/53858
 	* name-lookup.c (ambiguous_decl): Use DECL_TYPE_TEMPLATE_P.
 
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 0b2b2349481..713001e121f 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3704,7 +3704,7 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter)
 
 /* Nonzero for a NODE which declares a type.  */
 #define DECL_DECLARES_TYPE_P(NODE) \
-  (TREE_CODE (NODE) == TYPE_DECL || DECL_CLASS_TEMPLATE_P (NODE))
+  (TREE_CODE (NODE) == TYPE_DECL || DECL_TYPE_TEMPLATE_P (NODE))
 
 /* Nonzero if NODE declares a function.  */
 #define DECL_DECLARES_FUNCTION_P(NODE) \