PR testsuite/25241

[pf3gnuchains/gcc-fork.git] / gcc / testsuite / g++.old-deja / g++.pt / inherit2.C

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C b/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
index 46637a1..136050d 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
@@ -1,20 +1,67 @@
-// Test that we warn about unqualified references to implicit typenames.
-// Bug: g++ is confused by the binding for ::AN and crashes.
-// Special g++ Options:
-// crash test - XFAIL *-*-*
-
-template <class T> struct A {
-  struct AA { };
-  struct AB { };
-  struct AC { };
+// { 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 - 
+  }
 };
 
-template <class T> struct B: public A<T> {
-  friend struct B::AA;         // OK
-  friend AB;                   // WARNING - needs class-key
-  friend struct AC;            // WARNING - refers to ::AC
+// 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 () { }
+int main ()
+{
+  a_aa.M ();
+  a_ac.M ();
+  ac.M ();
+}