diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/enum6.C | 10 |
3 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9a832de8006..65bf6234f9e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-02-13 Jason Merrill <jason@redhat.com> + + PR c++/34774 + * pt.c (value_dependent_expression_p): Look into DECL_INITIAL + of enumerators, too. + 2008-02-12 Jason Merrill <jason@redhat.com> PR c++/34824 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a1e6521c852..577b6216580 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15638,7 +15638,7 @@ value_dependent_expression_p (tree expression) /* A non-type template parm. */ if (DECL_TEMPLATE_PARM_P (expression)) return true; - return false; + return value_dependent_expression_p (DECL_INITIAL (expression)); case VAR_DECL: /* A constant with integral or enumeration type and is initialized diff --git a/gcc/testsuite/g++.dg/template/enum6.C b/gcc/testsuite/g++.dg/template/enum6.C new file mode 100644 index 00000000000..9df6d41063b --- /dev/null +++ b/gcc/testsuite/g++.dg/template/enum6.C @@ -0,0 +1,10 @@ +// PR c++/34774 + +template<int shifts> +struct shift { + enum { + n0 = (unsigned)shifts, + n = n0 ? 0 : n0, + n_comp = -n + } x; +}; |