PR c++/7347, c++/7348

	PR c++/7347, c++/7348
	* cp-tree.h (tsubst_flags_t): Add tf_parsing.
	* decl.c (make_typename_type): Use it.
	(make_unbound_class_template): Likewise.
	(lookup_name_real): Don't call type_access_control if scope is
	template parameter dependent.
	* parse.y (template_arg): Call make_unbound_class_template with
	tf_parsing set.
	(nest_name_specifier): Call make_typename_type with tf_parsing set.
	(typename_sub0): Likewise.
	(typename_sub1): Likewise.
	(instantiate_decl): Push class scope.
	* pt.c (regenerate_decl_from_template): Call pushclass and popclass
	for both static variable and member function template.
	(instantiate_decl) Call pushclass and popclass when tsubst'ing type
	and arguments.
	* search.c (type_access_control): Do type access for TEMPLATE_DECL
	too.

	* g++.dg/template/access4.C: New test.
	* g++.dg/template/access5.C: New test.
	* g++.old-deja/g++.pt/memtemp85.C: Fix access problem.
	* g++.old-deja/g++.pt/memtemp86.C: Likewise.
	* g++.old-deja/g++.pt/ttp58.C: Likewise.
	* g++.old-deja/g++.pt/memtemp89.C: Remove XFAIL.

From-SVN: r55649

1 files changed, 21 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/template/access5.C b/gcc/testsuite/g++.dg/template/access5.C
new file mode 100644
index 00000000000..a9cb8a5075d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/access5.C
@@ -0,0 +1,21 @@
+// { dg-do compile }
+// Origin: Wolfgang Bangerth <wolfgang.bangerth@iwr.uni-heidelberg.de>
+
+// PR c++/7348
+// Access control for typename in function return type
+
+class Outer {
+    template <int dim> struct Inner {
+        typedef int T;
+        T foo ();
+    };
+  public:
+    Outer();
+};
+
+template <int dim>
+typename Outer::Inner<dim>::T  Outer::Inner<dim>::foo () {
+  return 1;
+};
+
+template Outer::Inner<2>;