typeck.c (get_delta_difference): If via a virtual base, return zero.

cp:
	* typeck.c (get_delta_difference): If via a virtual base,
	return zero.
	* cvt.c (cp_convert_to_pointer): If via a virtual base, do no
	adjustment.
testsuite:
	* g++.old-deja/g++.mike/pmf5.C: Remove test.

From-SVN: r38039

2 files changed, 4 insertions, 31 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f9630fe..54d8296 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-05  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* g++.old-deja/g++.mike/pmf5.C: Remove test.
+
 2000-12-05  Richard Henderson  <rth@redhat.com>
 
 	* gcc.c-torture/compile/20001205-1.c: New.
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/pmf5.C b/gcc/testsuite/g++.old-deja/g++.mike/pmf5.C
deleted file mode 100644
index 685801a..0000000
--- a/gcc/testsuite/g++.old-deja/g++.mike/pmf5.C
+++ /dev/null
@@ -1,31 +0,0 @@
-// Special g++ Options: -w
-
-class A {
-  int j;
-};
-
-class Space {
-  int j;
-};
-
-typedef int (A::*pma)();
-
-class B : public Space, virtual public A {
-public:
-  int i;
-  int foo () {
-    return i!=42;
-  }
-  B() {
-    i = 42;
-  }
-};
-
-int call_base (A* ap, pma pmf) {
-  return (ap->*pmf)();
-}
-
-int main() {
-  B b;
-  return call_base ((A*)&b, (pma)&B::foo);
-}