DR 325 PR c++/51666

	DR 325
	PR c++/51666
	* parser.c (cp_parser_cache_defarg): Split out...
	(cp_parser_parameter_declaration): ...from here.
	(cp_parser_save_nsdmi): Use it.
	(cp_parser_cache_group): Remove CPP_COMMA support.

From-SVN: r182809

gcc/cp/ChangeLog

+2012-01-02  Jason Merrill  <jason@redhat.com>
+
+	DR 325
+	PR c++/51666
+	* parser.c (cp_parser_cache_defarg): Split out...
+	(cp_parser_parameter_declaration): ...from here.
+	(cp_parser_save_nsdmi): Use it.
+	(cp_parser_cache_group): Remove CPP_COMMA support.
+
 2012-01-02  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/51462

gcc/testsuite/ChangeLog

+2012-01-02  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51666
+	* g++.dg/cpp0x/nsdmi-defer5.C: New.
+
 2012-01-02  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/51462

gcc/testsuite/g++.dg/cpp0x/nsdmi-defer5.C

+// PR c++/51666 (DR 325)
+// { dg-options -std=c++0x }
+
+template<typename T, typename U>
+struct tuple
+{
+  tuple(T, U) { }
+};
+
+struct Y
+{
+  tuple<int, int> tt = tuple<int, int>{1, 2};
+};
+
+struct A
+{
+  int i = 0;
+  int j = i < 42, k;		// OK, declares j and k
+  int l = i < 42, 24;		// { dg-error "" }
+};