projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d30a17f)
* cp-tree.h (DECL_DECLARES_TYPE_P): Check DECL_TYPE_TEMPLATE_P.
authorJason Merrill <jason@redhat.com>
Fri, 6 Jul 2012 14:00:44 +0000 (10:00 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Fri, 6 Jul 2012 14:00:44 +0000 (10:00 -0400)
From-SVN: r189332

gcc/cp/ChangeLog patch | blob | history
gcc/cp/cp-tree.h patch | blob | history

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 58010047555d914d7ba55cad31a89338afa8f4dc..0bd2c77513dac54ecc0a8b00786fb04e696713f4 100644 (file)
--- 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 0b2b23494811278666cabcb688d9b2c478ce1701..713001e121f2b86d022f72b56d7e868d7e86bd2d 100644 (file)
--- 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) \