obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 67 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C b/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
new file mode 100644
index 000000000..136050d45
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
@@ -0,0 +1,67 @@
+// { dg-do assemble  }
+
+// Make sure we make the right unqualified class a friend
+// See PR c++/4403
+
+template <class T> struct A
+{
+  struct AA;
+  struct AC;
+};
+
+template <class T> class B
+  :public A<T>
+{
+  friend struct B::AA;		// OK, this has an implicit typename
+				// as if it is 'friend struct typename B::AA'
+				// (I think there's a defect report
+				// about that)
+  friend struct AC;	// this makes ::AC a friend *not* A<T>::AC
+
+  private: // only our friends can get out values
+  static T valueA_AA;
+  static T valueA_AC;
+  static T value_AC;
+};
+template <typename T> T B<T>::valueA_AA;
+template <typename T> T B<T>::valueA_AC;// { dg-error "" "" } private - 
+template <typename T> T B<T>::value_AC;	// { dg-bogus "" "" }  - 
+
+// this one is a friend
+template <class T> struct A<T>::AA
+{
+  int M ()
+  {
+    return B<T>::valueA_AA;
+  }
+};
+
+// this is not a friend
+template <class T> struct A<T>::AC
+{
+  T M ()
+  {
+    return B<T>::valueA_AC;	// { dg-error "" "" } within this context - 
+  }
+};
+
+// this is a friend
+struct AC 
+{
+  int M ()
+  {
+    return B<int>::value_AC;	// { dg-bogus "" "" }  - 
+  }
+};
+
+B<int> b;
+A<int>::AA a_aa;
+A<int>::AC a_ac;
+AC ac;
+
+int main ()
+{
+  a_aa.M ();
+  a_ac.M ();
+  ac.M ();
+}