OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jason Merrill 2013-03-17 16:32:17 -04:00 committed by Jason Merrill
parent 286fb67781
commit df5c5f7828
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -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> 2013-03-16 Jason Merrill <jason@redhat.com>
* decl.c (grokdeclarator): Assert that we won't see a pointer to * decl.c (grokdeclarator): Assert that we won't see a pointer to

4
gcc/cp/typeck2.c
View File

@ -265,10 +265,6 @@ abstract_virtuals_error_sfinae (tree decl, tree type, abstract_class_use use,
return 0; return 0;
type = TYPE_MAIN_VARIANT (type); 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, /* 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 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 only for objects for which we have a declaration or at least a