Merge from mainlinebefore_gc_merge_990902egcs_gc_branch

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

1 files changed, 5 insertions, 48 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4246.C b/gcc/testsuite/g++.old-deja/g++.mike/p4246.C
index 1eb6668e969..61e680d3728 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4246.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4246.C
@@ -1,48 +1,5 @@
-// prms-id: 4246
-
-extern "C" void abort ();
-int num_d;
-
-class A
-{
- public:
-  A() { }
-  virtual  ~A() { }
-  virtual  id() { }
-};
-
-class B
-{
- public:
-  B() { }
-  virtual  ~B() { }
-  virtual  id() { }
-};
-
-class C : public A, public B
-{
- public:
-  C() { }
-  virtual  ~C() { }
-  id() { abort(); }
-};
-
-class D : public C
-{
- public:
-  D() { ++num_d; }
-  virtual  ~D() { -- num_d; }
-  id() { }
-};
-
-main()
-{
-  D* dp2 = new D;
-  ((B*)dp2)->id();
-  delete (B*) dp2;
-
-  B* bp1 = new D;
-  bp1->id();
-  delete bp1;
-  return num_d != 0;
-}
+  virtual void id() { }
+  virtual void id() { }
+  void id() { abort(); }
+  void id() { }
+int main()