update

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32214 138bc75d-0d04-0410-961f-82ee72b054a4

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 (file)
--- 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 (file)
--- 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() { }
 };