procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DR 1004

Browse source 
DR 1004
	* pt.c (convert_template_argument): Don't complain about using
	injected-class-name as template template argument.

From-SVN: r174318
This commit is contained in:
Jason Merrill 2011-05-27 00:01:56 -04:00 • committed by Jason Merrill
parent 7c999b5781
commit 5ac537d7b4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/ChangeLog
View file

@ -1,5 +1,9 @@
2011-05-26 Jason Merrill <jason@redhat.com>
DR 1004
* pt.c (convert_template_argument): Don't complain about using
injected-class-name as template template argument.
PR c++/47956
* decl.c (check_static_variable_definition): Now static.
(cp_finish_decl): Call it here.

4
gcc/cp/pt.c
View file

@ -5962,7 +5962,9 @@ convert_template_argument (tree parm,
tree t = maybe_get_template_decl_from_type_decl (TYPE_NAME (arg));
if (TREE_CODE (t) == TEMPLATE_DECL)
{
if (complain & tf_warning_or_error)
if (cxx_dialect >= cxx0x)
/* OK under DR 1004. */;
else if (complain & tf_warning_or_error)
pedwarn (input_location, OPT_pedantic, "injected-class-name %qD"
" used as template template argument", TYPE_NAME (arg));
else if (flag_pedantic_errors)