diff options
author | Brendan Kehoe <brendan@lisa.cygnus.com> | 1997-10-07 00:08:46 +0000 |
---|---|---|
committer | Brendan Kehoe <brendan@lisa.cygnus.com> | 1997-10-07 00:08:46 +0000 |
commit | ae26b5a9079093dcf8f486421cf2c2c56ba12c43 (patch) | |
tree | fb5b526dee8d52c451c48ab41cec9aac742fbbb6 /gcc/testsuite/g++.old-deja/g++.law | |
parent | a87537cfecd0455ada6ce1dde505a88fbfce34bb (diff) |
add missing tests, put in various test adjustments from devo
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@15850 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/g++.old-deja/g++.law')
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.law/missed-error2.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.law/visibility1.C | 68 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.law/visibility2.C | 68 |
3 files changed, 139 insertions, 1 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C index c8768055d93..4589bb11235 100644 --- a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C +++ b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C @@ -17,7 +17,9 @@ main() { foo(4, -37, 14.39, 14.38); } -static void foo(int i, int j, double x, double y) { // ERROR - extern +// 971006 we no longer give an error for this since we emit a hard error +// about the declaration above +static void foo(int i, int j, double x, double y) { cout << "Max(int): " << max(i,j) << " Max(double): " << max(x,y) << '\n'; diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility1.C b/gcc/testsuite/g++.old-deja/g++.law/visibility1.C new file mode 100644 index 00000000000..0314c0741c2 --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.law/visibility1.C @@ -0,0 +1,68 @@ +// Build don't link: +// GROUPS passed visibility +#include <iostream.h> + + + +class base { +//========== + + void base_priv(char * n) + { cout << "base_priv called from: " << n << "\n"; }; + +protected: + + void base_prot(char * n) + { cout << "base_prot called from: " << n << "\n"; }; + +public: + + void base_publ(char * n) + { cout << "base_publ called from: " << n << "\n"; }; + + void test(char * n) { base_publ(n); base_prot(n); base_priv(n); } + +}; // class base + + + +class derived : private base { // Make this public, +//============================ // and we don't get an error + +friend void derived_friend(); + +public : + + void test(char * n) { base_publ(n); base_prot(n);} + +}; // class derived + + + +void +derived_friend() +//-------------- +{ + derived pd; + + pd.base_publ("friend of derived class"); // Compiler error here + pd.base_prot("friend of derived class"); +} + + + +main(int argc, char *argv[]) +//========================== +{ + base b; + b.base_publ("base class object"); + b.test("member of base class object"); + cout << "\n"; + + derived pd; + pd.test("member of derived class object"); + derived_friend(); + cout << "\n"; + +} /* main */ + diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility2.C b/gcc/testsuite/g++.old-deja/g++.law/visibility2.C new file mode 100644 index 00000000000..8ac5cb9e71c --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.law/visibility2.C @@ -0,0 +1,68 @@ +// Build don't link: +// GROUPS passed visibility +#include <iostream.h> + + + +class base { +//========== + + void base_priv(char * n) + { cout << "base_priv called from: " << n << "\n"; }; + +protected: + + void base_prot(char * n) + { cout << "base_prot called from: " << n << "\n"; }; + +public: + + void base_publ(char * n) + { cout << "base_publ called from: " << n << "\n"; }; + + void test(char * n) { base_publ(n); base_prot(n); base_priv(n); } + +}; // class base + + + +class derived : public base { // Make this public, +//============================ // and we don't get an error + +friend void derived_friend(); + +public : + + void test(char * n) { base_publ(n); base_prot(n);} + +}; // class derived + + + +void +derived_friend() +//-------------- +{ + derived pd; + + pd.base_publ("friend of derived class"); // Compiler error here + pd.base_prot("friend of derived class"); +} + + + +main(int argc, char *argv[]) +//========================== +{ + base b; + b.base_publ("base class object"); + b.test("member of base class object"); + cout << "\n"; + + derived pd; + pd.test("member of derived class object"); + derived_friend(); + cout << "\n"; + +} /* main */ + |