diff options
author | Jason Merrill <jason@gcc.gnu.org> | 2000-02-13 14:07:43 -0500 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2000-02-13 14:07:43 -0500 |
commit | d2e7ab702f49e69663e9781ff8f5ebd1c61da01c (patch) | |
tree | d9b72695e3325b5fd197ce16e038323cead2c638 /gcc | |
parent | 97ce4a51fa4fc1e9fc68bd8c8b77b5f04a2edca4 (diff) | |
download | gcc-d2e7ab702f49e69663e9781ff8f5ebd1c61da01c.zip gcc-d2e7ab702f49e69663e9781ff8f5ebd1c61da01c.tar.gz gcc-d2e7ab702f49e69663e9781ff8f5ebd1c61da01c.tar.bz2 |
update
From-SVN: r31955
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.jason/access15.C | 2 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.law/access5.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.law/visibility25.C | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access15.C b/gcc/testsuite/g++.old-deja/g++.jason/access15.C index 4380998..1149a94 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 8d25ed2..4c20da0 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 76ca8d8..607e25a 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; }; |