diff options
author | Brendan Kehoe <brendan@gcc.gnu.org> | 1997-10-06 20:08:46 -0400 |
---|---|---|
committer | Brendan Kehoe <brendan@gcc.gnu.org> | 1997-10-06 20:08:46 -0400 |
commit | 45f22fa2551c0002d82ff11384921418dc67711c (patch) | |
tree | fb5b526dee8d52c451c48ab41cec9aac742fbbb6 /gcc | |
parent | 3f2270ec44b986eabf4b541feb4ff9a7e91d6353 (diff) | |
download | gcc-45f22fa2551c0002d82ff11384921418dc67711c.zip gcc-45f22fa2551c0002d82ff11384921418dc67711c.tar.gz gcc-45f22fa2551c0002d82ff11384921418dc67711c.tar.bz2 |
add missing tests, put in various test adjustments from devo
From-SVN: r15850
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.benjamin/p12475.C | 2 | ||||
-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 |
4 files changed, 140 insertions, 2 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.benjamin/p12475.C b/gcc/testsuite/g++.old-deja/g++.benjamin/p12475.C index fecbd57..ee1e39f 100644 --- a/gcc/testsuite/g++.old-deja/g++.benjamin/p12475.C +++ b/gcc/testsuite/g++.old-deja/g++.benjamin/p12475.C @@ -1,5 +1,5 @@ // Build don't link: // prms-id: 12475 -enum huh { start =-2147483648, next }; +enum huh { start =-2147483648, next }; // WARNING - 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 c876805..4589bb1 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 0000000..0314c07 --- /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 0000000..8ac5cb9 --- /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 */ + |