pt.c (for_each_template_parm): Traverse the TYPE_CONTEXT for types.

	* pt.c (for_each_template_parm): Traverse the TYPE_CONTEXT for
	types.

From-SVN: r20498

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 69856b7e8ddb2fb63f420008fb238dea47d922f2..9fe7fdd6ccb8738071448c48bcc1637ace1e221c 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3164,6 +3164,11 @@ for_each_template_parm (t, fn, data)
 {
   if (!t)
     return 0;
+
+  if (TREE_CODE_CLASS (TREE_CODE (t)) == 't'
+      && for_each_template_parm (TYPE_CONTEXT (t), fn, data))
+    return 1;
+
   switch (TREE_CODE (t))
     {
     case INDIRECT_REF:

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/enum4.C b/gcc/testsuite/g++.old-deja/g++.pt/enum4.C
new file mode 100644 (file)
index 0000000..28f4b29
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/enum4.C
@@ -0,0 +1,16 @@
+// Build don't link:
+
+template <class T>
+struct U
+{
+  T mT;
+};
+ 
+template <class H>
+struct M
+{
+  enum FLAG {On, Off};
+  U<FLAG> mUF;
+};
+
+M<char> gm;