diff options
| author | Jason Merrill <jason@redhat.com> | 2013-03-17 16:32:17 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-03-17 16:32:17 -0400 |
| commit | df5c5f782883994df067140982464df293687cfd (patch) | |
| tree | c1804474bfef8953aed9d2a6fde7b72cbf23305e /gcc | |
| parent | 286fb67781dc30504ab07890fc6867cce92d8ddd (diff) | |
| download | gcc-df5c5f782883994df067140982464df293687cfd.zip gcc-df5c5f782883994df067140982464df293687cfd.tar.gz gcc-df5c5f782883994df067140982464df293687cfd.tar.bz2 | |
re PR c++/17232 ([DR 1640] classes and class template specializations treated differently w.r.t. core issue #337)
PR c++/17232
PR c++/56642
* typeck2.c (abstract_virtuals_error_sfinae): Revert complete_type
change for now.
From-SVN: r196758
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dc094f7..b341e92 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2013-03-17 Jason Merrill <jason@redhat.com> + + PR c++/17232 + PR c++/56642 + * typeck2.c (abstract_virtuals_error_sfinae): Revert complete_type + change for now. + 2013-03-16 Jason Merrill <jason@redhat.com> * decl.c (grokdeclarator): Assert that we won't see a pointer to diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 3bac67c..24b5593 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -265,10 +265,6 @@ abstract_virtuals_error_sfinae (tree decl, tree type, abstract_class_use use, return 0; type = TYPE_MAIN_VARIANT (type); - /* In SFINAE context, force instantiation. */ - if (!(complain & tf_error)) - complete_type (type); - /* If the type is incomplete, we register it within a hash table, so that we can check again once it is completed. This makes sense only for objects for which we have a declaration or at least a |