/cp
2014-05-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/60999
	* pt.c (maybe_begin_member_template_processing): Use
	uses_template_parms.

/testsuite
2014-05-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/60999
	* g++.dg/cpp0x/nsdmi-template9.C: New.
	* g++.dg/cpp0x/nsdmi-template10.C: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210140 138bc75d-0d04-0410-961f-82ee72b054a4
Merge remote-tracking branch 'gnu/master' into 4.10.0