diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 2000-02-27 02:00:35 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-02-27 02:00:35 -0500 |
| commit | 6aede5678763545abe158ca6000921015db57013 (patch) | |
| tree | 3dff3c56128e6cf23666c8362e59f8bda5cc1304 /gcc | |
| parent | 1ab83276edecdf4237e07a41301efa97bebc8726 (diff) | |
| download | gcc-6aede5678763545abe158ca6000921015db57013.zip gcc-6aede5678763545abe158ca6000921015db57013.tar.gz gcc-6aede5678763545abe158ca6000921015db57013.tar.bz2 | |
update
From-SVN: r32214
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.mike/net34.C | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.mike/p4623.C | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net34.C b/gcc/testsuite/g++.old-deja/g++.mike/net34.C index 51266a3..f723d74 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/net34.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/net34.C @@ -23,8 +23,8 @@ class multiple : public bar_1, public bar_2 { public: multiple(int i1, int i2) : bar_1(i1), bar_2(i2) {} void print() { - cout << "bar_1::k -> " << bar_1::k << "\n"; - cout << "bar_2::k -> " << bar_2::k << "\n"; + cout << "bar_1::k -> " << ((bar_1 *)this)->k << "\n"; + cout << "bar_2::k -> " << ((bar_2 *)this)->k << "\n"; cout << "bar_1::get_k() -> " << bar_1::get_k() << "\n"; cout << "bar_2::get_k() -> " << bar_2::get_k() << "\n"; } diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4623.C b/gcc/testsuite/g++.old-deja/g++.mike/p4623.C index 00ab576..a2c62cf 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/p4623.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/p4623.C @@ -26,7 +26,7 @@ class base3: public base {}; class derived: public base3, public base1, public base2 { public: int d_data; - derived( int i ) { d_data = i; base3::b_data++; } + derived( int i ) { d_data = i; ((base3 *)this)->b_data++; } void d_print() { } }; |