cp:

	PR c++/11794
	* class.c (pushclass): Push dependent using decls for nested
	classes of templates too.
testsuite:
	PR c++/11794
	* g++.dg/parse/using3.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71143 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 944bfd7..0e657be 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+       PR c++/11794
+       * class.c (pushclass): Push dependent using decls for nested
+       classes of templates too.
+
 2003-09-06  Roger Sayle  <roger@eyesopen.com>
 
        PR c++/11409

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 80765c0..d17ff5a 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5466,9 +5466,9 @@ pushclass (tree type)
   if (type != previous_class_type || current_class_depth > 1)
     {
       push_class_decls (type);
-      if (CLASSTYPE_IS_TEMPLATE (type))
+      if (CLASSTYPE_TEMPLATE_INFO (type) && !CLASSTYPE_USE_TEMPLATE (type))
        {
-         /* If we are entering the scope of a template (not a
+         /* If we are entering the scope of a template declaration (not a
             specialization), we need to push all the using decls with
             dependent scope too.  */
          tree fields;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e3c766c..331c00d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+       PR c++/11794
+       * g++.dg/parse/using3.C: New test.
+
 2003-09-06  Roger Sayle  <roger@eyesopen.com>
 
        PR c++/11409

diff --git a/gcc/testsuite/g++.dg/parse/using3.C b/gcc/testsuite/g++.dg/parse/using3.C
new file mode 100644 (file)
index 0000000..c266b68
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/using3.C
@@ -0,0 +1,22 @@
+// { dg-do compile }
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 6 Sep 2003 <nathan@codesourcery.com>
+// Origin: stefaandr@hotmail.com
+
+// PR c++/11794. Using decl in nested classes of a template class
+
+template <typename T> struct a
+{
+  struct a1: T
+  {
+    using T::aa;
+    
+    a1() { aa = 5; }
+  };
+};
+struct b { int aa; };
+template <> struct a<int>::a1 { a1 () {} };
+
+a<b>::a1 a_b;
+a<int>::a1 a_i;