diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-31 16:29:49 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-31 16:29:49 -0400 |
| commit | c454d74afcf58585beddb8d300f77d615d65330c (patch) | |
| tree | 9dd79a48dc3f7fecf3b4b267e73084419d3d3637 /gcc | |
| parent | 4e36c2131fcffc92881baa8dca67c868574bfacb (diff) | |
| download | gcc-c454d74afcf58585beddb8d300f77d615d65330c.zip gcc-c454d74afcf58585beddb8d300f77d615d65330c.tar.gz gcc-c454d74afcf58585beddb8d300f77d615d65330c.tar.bz2 | |
re PR c++/48280 ([C++0x] ICE: tree check: expected var_decl or function_decl, have template_decl in check_bases_and_members, at cp/class.c:4695)
PR c++/48280
* method.c (defaultable_fn_check): Templates are not defaultable.
From-SVN: r171797
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/method.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/defaulted24.C | 6 |
4 files changed, 19 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c2f9831..dce49e9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-03-31 Jason Merrill <jason@redhat.com> + PR c++/48280 + * method.c (defaultable_fn_check): Templates are not defaultable. + * parser.c (cp_parser_init_declarator): Avoid redundant cp_finish_decl for member declarations. diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 386a818..b741516 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1588,6 +1588,12 @@ defaultable_fn_check (tree fn) { special_function_kind kind = sfk_none; + if (template_parm_scope_p ()) + { + error ("a template cannot be defaulted"); + return false; + } + if (DECL_CONSTRUCTOR_P (fn)) { if (FUNCTION_FIRST_USER_PARMTYPE (fn) == void_list_node) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b34ea85..81f9bb2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-03-31 Jason Merrill <jason@redhat.com> + + * g++.dg/cpp0x/defaulted24.C: New. + 2011-03-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR target/16292 diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted24.C b/gcc/testsuite/g++.dg/cpp0x/defaulted24.C new file mode 100644 index 0000000..307bf94 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted24.C @@ -0,0 +1,6 @@ +// PR c++/48280 +// { dg-options -std=c++0x } + +struct S { + template < typename > S (const S &) = default; // { dg-error "" } +}; |