From: Robert Lipe <robertl@gcc.gnu.org>
Date: Sun, 31 May 1998 20:47:01 +0000 (+0000)
Subject: Additional changes from Martin von Loewis.
X-Git-Tag: prereleases/egcs-1.1-prerelease~1004
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c3f1e1d9f5cfa5cf3d755b0f58d164fca1570e;p=thirdparty%2Fgcc.git

Additional changes from Martin von Loewis.

From-SVN: r20153
---

diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb17.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb17.C
index 86b542492b7f..f32dadba9a53 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb17.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb17.C
@@ -1,3 +1,5 @@
+// excess errors test - XFAIL
+// covariant return types in are currently not support for complex inheritance
 #include <stdio.h>
 
 class A {
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb32.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb32.C
index b5bc839d2b26..95e161782983 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb32.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb32.C
@@ -6,7 +6,7 @@ public:
 
 void A::malloc(unsigned int) {}
 
-int foo() {
+void foo() {
     A a;
     a.malloc(3);    // <-- line 10
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb50.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb50.C
index c6eb4aa32168..c7f90766af21 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb50.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb50.C
@@ -9,8 +9,8 @@ int main()
 {
         try {
                 f(0, 0);
-                return 0;
-        } catch (foo x) {
                 return 1;
+        } catch (foo x) {
+                return 0;
         }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb76.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb76.C
index c32b10411eac..0d352dd416db 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb76.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb76.C
@@ -1,3 +1,4 @@
+//Build don't link:
 // from include/g++/stl_relops.h
 template <class T>
 inline bool operator!=(const T& x, const T& y) {
@@ -6,7 +7,7 @@ inline bool operator!=(const T& x, const T& y) {
 
 enum T {
   V1,
-};
+};                           // ERROR -
 
 struct X {
   T      t : 31;
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C
index 599d0421c5b4..5691532b99f2 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C
@@ -8,7 +8,7 @@ T max(T a, T b)
 }
 
 // Prototypes (enable one or the other)
-double max<>(double, double);
+double max<>(double, double);      // ERROR - bogus code
 // int max(int, int);
 
 int main()