From: Jason Merrill <jason@gcc.gnu.org>
Date: Sun, 27 Feb 2000 07:00:35 +0000 (-0500)
Subject: update
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6aede5678763545abe158ca6000921015db57013;p=gcc.git

update

From-SVN: r32214
---

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net34.C b/gcc/testsuite/g++.old-deja/g++.mike/net34.C
index 51266a35d48..f723d7402e0 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 00ab5761116..a2c62cf7066 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() { }
 };