cp:
	PR g++/3381
	* parse.y (named_complex_class_head_sans_basetype): Add new
	reduction.
	* Make-lang.in (parse.c): Adjust expected conflict count.
testsuite:
	* g++.dg/other/scope1.C: New test.
	* g++.dg/template/explicit-instantiation.C: Remove XFAIL

From-SVN: r47546