re PR c++/25492 (friend class nested in derived class problem)

	PR c++/25492
	* name-lookup.c (push_class_level_binding): When a derived class
	provides a type binding, eliminate any type binding from a base
	class. 
	PR c++/25625
	* repo.c (repo_emit_p): Always instantiate static data members
	initialized by constant expressions, so that there values are
	available.
	PR c++/25492
	* g++.dg/lookup/friend9.C: New test.
	PR c++/25625
	* g++.dg/template/repo5.C: New test.

From-SVN: r109307