From 45591aaf4d0bbed245a143235383dc125f822ece Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Thu, 11 Sep 1997 16:00:02 +0000
Subject: [PATCH] crash20.C: Rework to avoid libg++.

        * g++.old-deja/g++.brendan/crash20.C: Rework to avoid libg++.
        * g++.old-deja/g++.brendan/crash30.C: Likewise.
        * g++.old-deja/g++.brendan/crash39.C: Likewise.
        * g++.old-deja/g++.law/operators4.C: Likewise.

From-SVN: r15407
---
 gcc/testsuite/ChangeLog                       |  7 +++++
 .../g++.old-deja/g++.brendan/crash20.C        |  3 +-
 .../g++.old-deja/g++.brendan/crash30.C        |  4 +--
 .../g++.old-deja/g++.brendan/crash39.C        | 30 +++++++++++++++++--
 .../g++.old-deja/g++.law/operators4.C         |  3 +-
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e6cda1cba0..e08f5577d57 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 11 10:00:03 1997  Alexandre Oliva  (oliva@dcc.unicamp.br)
+
+	* g++.old-deja/g++.brendan/crash20.C: Rework to avoid libg++.
+	* g++.old-deja/g++.brendan/crash30.C: Likewise.
+	* g++.old-deja/g++.brendan/crash39.C: Likewise.
+	* g++.old-deja/g++.law/operators4.C: Likewise.
+
 Thu Sep 11 09:53:40 1997  Joe Buck  (jbuck@synopsys.com)
 
 	* g++.old-deja/g++.mike/p658.C: eliminate <bool.h> use.
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash20.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash20.C
index 060be1c39f4..7704b98ebd2 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash20.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash20.C
@@ -1,6 +1,7 @@
 // Build don't link: 
 // GROUPS passed old-abort
-#include <Complex.h>
+#include <complex>
+typedef complex<double> Complex;
 
 Complex ComputeVVself()
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C
index ac73525536e..b54fe19817e 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C
@@ -1,9 +1,9 @@
 // Build don't link: 
 // GROUPS passed old-abort
-#include <String.h>
+#include <string>
 
 main(void) {
 
-  String a[] = {"Hello"};
+  string a[] = {"Hello"};
 
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash39.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash39.C
index f267abd6147..f2b33de1c17 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash39.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash39.C
@@ -1,8 +1,34 @@
 // Build don't link: 
 // Special g++ Options: -w
 // GROUPS passed old-abort
-#include <GetOpt.h>
-#include <String.h>
+//#include <GetOpt.h>
+#include <std.h>
+#include <stdio.h>
+
+class GetOpt
+{
+private:
+  static char *nextchar;
+   enum OrderingEnum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER };
+   OrderingEnum ordering;
+  static int first_nonopt;
+  static int last_nonopt;
+  void exchange (char **argv);
+public:
+  char *optarg;
+  int optind;
+  int opterr;
+  
+  int    nargc;
+  char **nargv;
+  const char  *noptstring;
+  
+  GetOpt (int argc, char **argv, const char *optstring);
+  int operator () (void);
+};
+//end <GetOpt.h>
+#include <string>
+
 class foo {public: foo () {}};
 class bar {public: bar (foo& dflt);};
 class baz: public bar {public: baz (): bar (foo ()) {}};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators4.C b/gcc/testsuite/g++.old-deja/g++.law/operators4.C
index 259d3e53f21..e5df81d3a29 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators4.C
@@ -5,7 +5,8 @@
 // Subject:  delete [size] pointer; Problem
 // Message-ID: <92Sep3.220137edt.30@jarvis.csri.toronto.edu>
 
-#include <Complex.h>
+#include <complex>
+typedef complex<double> Complex;
 #include <stdio.h>
 
 class Vector {
-- 
2.30.2