diff options
| author | Jason Merrill <jason@redhat.com> | 2012-07-06 10:00:44 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-07-06 10:00:44 -0400 |
| commit | df947b0a640b9c8306e4ef0a64a330df9f82b46e (patch) | |
| tree | 8e89932c102b5d1d6412d2ed56460c1973a36336 /gcc/cp | |
| parent | d30a17fc577b895a3a7398a3ae8715e01e23d845 (diff) | |
| download | gcc-df947b0a640b9c8306e4ef0a64a330df9f82b46e.zip gcc-df947b0a640b9c8306e4ef0a64a330df9f82b46e.tar.gz gcc-df947b0a640b9c8306e4ef0a64a330df9f82b46e.tar.bz2 | |
* cp-tree.h (DECL_DECLARES_TYPE_P): Check DECL_TYPE_TEMPLATE_P.
From-SVN: r189332
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5801004..0bd2c77 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 0b2b234..713001e 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) \ |