diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/decltype27.C | 9 |
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 168f43a..a1b0aec 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-23 Jason Merrill <jason@redhat.com> + + PR c++/48617 + * pt.c (invalid_nontype_parm_type_p): Allow DECLTYPE_TYPE. + 2011-05-23 Nathan Froyd <froydnj@codesourcery.com> * call.c (build_over_call): Tweak call to check_function_arguments. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index d72596f..380b21e 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -18089,6 +18089,8 @@ invalid_nontype_parm_type_p (tree type, tsubst_flags_t complain) return 0; else if (TREE_CODE (type) == TYPENAME_TYPE) return 0; + else if (TREE_CODE (type) == DECLTYPE_TYPE) + return 0; if (complain & tf_error) error ("%q#T is not a valid type for a template constant parameter", type); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index be8b2ea..47f0dac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-05-23 Jason Merrill <jason@redhat.com> + + * g++.dg/cpp0x/decltype27.C: New. + 2011-05-23 Richard Guenther <rguenther@suse.de> * gcc.dg/tree-ssa/forwprop-11.c: Adjust and un-XFAIL. diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype27.C b/gcc/testsuite/g++.dg/cpp0x/decltype27.C new file mode 100644 index 0000000..cb962ad --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/decltype27.C @@ -0,0 +1,9 @@ +// PR c++/48617 +// { dg-options -std=c++0x } + +template<class T, decltype(T())> // # +struct A {}; + +A<int, 0> a; + +int main() {} |