aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2000-05-14 20:47:08 -0400
committerJason Merrill <jason@gcc.gnu.org>2000-05-14 20:47:08 -0400
commit40c954b902ffda31de2ae17b160aaf5a200eba04 (patch)
tree61de1fdd3be4d1a6666ca3fca2a615420bec7465
parentf617b8e22206f6201c4e7226fcadb92a09aeab66 (diff)
downloadgcc-40c954b902ffda31de2ae17b160aaf5a200eba04.zip
gcc-40c954b902ffda31de2ae17b160aaf5a200eba04.tar.gz
gcc-40c954b902ffda31de2ae17b160aaf5a200eba04.tar.bz2
update
From-SVN: r33902
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch3.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch3p.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch4.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch4p.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch5.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch5p.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch6.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch6p.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch7.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch7p.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch8.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch8p.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch9.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.eh/catch9p.C4
14 files changed, 42 insertions, 14 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch3.C b/gcc/testsuite/g++.old-deja/g++.eh/catch3.C
index 0451d77..bc30df7 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch3.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch3.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a non-virtual public
@@ -8,6 +8,8 @@
// D--B--A
// +--C--A
+// Special g++ Options: -w
+
struct A { int m; };
struct B : A { int m; };
struct C : A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch3p.C b/gcc/testsuite/g++.old-deja/g++.eh/catch3p.C
index 33873aa..34182e2 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch3p.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch3p.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a non-virtual
@@ -8,6 +8,8 @@
// D--B--A
// +--C--A
+// Special g++ Options: -w
+
struct A { int m; virtual ~A(){}};
struct B : A { int m; };
struct C : A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch4.C b/gcc/testsuite/g++.old-deja/g++.eh/catch4.C
index 94c602c..b67b70e 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch4.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch4.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a virtual public
@@ -8,6 +8,8 @@
// D--B==A
// +--C==A
+// Special g++ Options: -w
+
struct A { int m; };
struct B : virtual A { int m; };
struct C : virtual A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch4p.C b/gcc/testsuite/g++.old-deja/g++.eh/catch4p.C
index 19c2273..5cc56c0 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch4p.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch4p.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a virtual
@@ -8,6 +8,8 @@
// D--B==A
// +--C==A
+// Special g++ Options: -w
+
struct A { int m; virtual ~A(){}};
struct B : virtual A { int m; };
struct C : virtual A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch5.C b/gcc/testsuite/g++.old-deja/g++.eh/catch5.C
index 9dff637..59e111e 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch5.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch5.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -8,6 +8,8 @@
// +--C==A
// +--AA-A
+// Special g++ Options: -w
+
struct A { int m; };
struct B : virtual A { int m; };
struct C : virtual A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch5p.C b/gcc/testsuite/g++.old-deja/g++.eh/catch5p.C
index c6a5d0a..218097e 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch5p.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch5p.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -8,6 +8,8 @@
// +--C==A
// +--AA-A
+// Special g++ Options: -w
+
struct A { int m; virtual ~A(){}};
struct B : virtual A { int m; };
struct C : virtual A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch6.C b/gcc/testsuite/g++.old-deja/g++.eh/catch6.C
index 1ac4812..341e456 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch6.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch6.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -8,6 +8,8 @@
// +--C==A
// +--AA-A
+// Special g++ Options: -w
+
struct A { int m; };
struct B : virtual A { int m; };
struct C : virtual A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch6p.C b/gcc/testsuite/g++.old-deja/g++.eh/catch6p.C
index 3aac1a7..95d015b 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch6p.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch6p.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -8,6 +8,8 @@
// +--C==A
// +--AA-A
+// Special g++ Options: -w
+
struct A { int m; virtual ~A(){}};
struct B : virtual A { int m; };
struct C : virtual A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch7.C b/gcc/testsuite/g++.old-deja/g++.eh/catch7.C
index bf90e0e..1c24063 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch7.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch7.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -9,6 +9,8 @@
// +--C--A
// +--E--A
+// Special g++ Options: -w
+
struct A { int m; };
struct B : A { int m; };
struct C : A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch7p.C b/gcc/testsuite/g++.old-deja/g++.eh/catch7p.C
index be017c1..a689f1b 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch7p.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch7p.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -9,6 +9,8 @@
// +--C--A
// +--E--A
+// Special g++ Options: -w
+
struct A { int m; virtual ~A(){}};
struct B : A { int m; };
struct C : A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch8.C b/gcc/testsuite/g++.old-deja/g++.eh/catch8.C
index 685a4ec..e9f2545 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch8.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch8.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 6 Jun 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -7,6 +7,8 @@
// D--B--A
// +--C<<A
+// Special g++ Options: -w
+
struct A { int m; };
struct B : A { int m; };
struct C : private A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch8p.C b/gcc/testsuite/g++.old-deja/g++.eh/catch8p.C
index 972761d..08d349b 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch8p.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch8p.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 6 Jun 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -7,6 +7,8 @@
// D--B--A
// +--C<<A
+// Special g++ Options: -w
+
struct A { int m; virtual ~A(){}};
struct B : A { int m; };
struct C : private A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch9.C b/gcc/testsuite/g++.old-deja/g++.eh/catch9.C
index 13d8960..4f9355d 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch9.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch9.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -7,6 +7,8 @@
// D==B--A
// +==C--A
+// Special g++ Options: -w
+
struct A { int m; };
struct B : A { int m; };
struct C : A { int m; };
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catch9p.C b/gcc/testsuite/g++.old-deja/g++.eh/catch9p.C
index ff7bf30..1b2015a 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catch9p.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catch9p.C
@@ -1,4 +1,4 @@
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class.
@@ -7,6 +7,8 @@
// D==B--A
// +==C--A
+// Special g++ Options: -w
+
struct A { int m; virtual ~A(){}};
struct B : A { int m; };
struct C : A { int m; };