From: Jason Merrill <jason@gcc.gnu.org>
Date: Sun, 13 Feb 2000 19:07:43 +0000 (-0500)
Subject: update
X-Git-Tag: prereleases/libstdc++-2.92~8236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2e7ab702f49e69663e9781ff8f5ebd1c61da01c;p=thirdparty%2Fgcc.git

update

From-SVN: r31955
---

diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access15.C b/gcc/testsuite/g++.old-deja/g++.jason/access15.C
index 4380998521f3..1149a94931b7 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access15.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access15.C
@@ -10,7 +10,7 @@ struct Z {
 struct A : private Z { };
 struct B : public A
 {
-    Z foo;
+    ::Z foo;
     B();
     B(const B&);
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.law/access5.C b/gcc/testsuite/g++.old-deja/g++.law/access5.C
index 8d25ed2c6a7c..4c20da0b3f75 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/access5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/access5.C
@@ -13,12 +13,12 @@ public:
 protected:
   class nested_protected { int x; };
 private:
-  class nested_private { int x; };
+  class nested_private { int x; }; // ERROR - private
 };
 
 class derived : public enclose {
   nested_public obj1;     // ok
   nested_protected obj2;  // ok
-  nested_private obj3;    // error// ERROR - .* , XFAIL *-*-*
+  nested_private obj3;    // error// ERROR - in this context
 };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility25.C b/gcc/testsuite/g++.old-deja/g++.law/visibility25.C
index 76ca8d8b402b..607e25a00ce6 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility25.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility25.C
@@ -22,5 +22,5 @@ public:
         C(void) : B(), a() {}
 
 private:
-        A a;
+        ::A a;
 };