Commit 40c954b9 by Jason Merrill

update

From-SVN: r33902
parent f617b8e2
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a non-virtual public // We cannot catch an ambiguous base class. Check with a non-virtual public
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// D--B--A // D--B--A
// +--C--A // +--C--A
// Special g++ Options: -w
struct A { int m; }; struct A { int m; };
struct B : A { int m; }; struct B : A { int m; };
struct C : A { int m; }; struct C : A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a non-virtual // We cannot catch an ambiguous base class. Check with a non-virtual
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// D--B--A // D--B--A
// +--C--A // +--C--A
// Special g++ Options: -w
struct A { int m; virtual ~A(){}}; struct A { int m; virtual ~A(){}};
struct B : A { int m; }; struct B : A { int m; };
struct C : A { int m; }; struct C : A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a virtual public // We cannot catch an ambiguous base class. Check with a virtual public
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// D--B==A // D--B==A
// +--C==A // +--C==A
// Special g++ Options: -w
struct A { int m; }; struct A { int m; };
struct B : virtual A { int m; }; struct B : virtual A { int m; };
struct C : virtual A { int m; }; struct C : virtual A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. Check with a virtual // We cannot catch an ambiguous base class. Check with a virtual
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// D--B==A // D--B==A
// +--C==A // +--C==A
// Special g++ Options: -w
struct A { int m; virtual ~A(){}}; struct A { int m; virtual ~A(){}};
struct B : virtual A { int m; }; struct B : virtual A { int m; };
struct C : virtual A { int m; }; struct C : virtual A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// +--C==A // +--C==A
// +--AA-A // +--AA-A
// Special g++ Options: -w
struct A { int m; }; struct A { int m; };
struct B : virtual A { int m; }; struct B : virtual A { int m; };
struct C : virtual A { int m; }; struct C : virtual A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// +--C==A // +--C==A
// +--AA-A // +--AA-A
// Special g++ Options: -w
struct A { int m; virtual ~A(){}}; struct A { int m; virtual ~A(){}};
struct B : virtual A { int m; }; struct B : virtual A { int m; };
struct C : virtual A { int m; }; struct C : virtual A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// +--C==A // +--C==A
// +--AA-A // +--AA-A
// Special g++ Options: -w
struct A { int m; }; struct A { int m; };
struct B : virtual A { int m; }; struct B : virtual A { int m; };
struct C : virtual A { int m; }; struct C : virtual A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// +--C==A // +--C==A
// +--AA-A // +--AA-A
// Special g++ Options: -w
struct A { int m; virtual ~A(){}}; struct A { int m; virtual ~A(){}};
struct B : virtual A { int m; }; struct B : virtual A { int m; };
struct C : virtual A { int m; }; struct C : virtual A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
// +--C--A // +--C--A
// +--E--A // +--E--A
// Special g++ Options: -w
struct A { int m; }; struct A { int m; };
struct B : A { int m; }; struct B : A { int m; };
struct C : A { int m; }; struct C : A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
// +--C--A // +--C--A
// +--E--A // +--E--A
// Special g++ Options: -w
struct A { int m; virtual ~A(){}}; struct A { int m; virtual ~A(){}};
struct B : A { int m; }; struct B : A { int m; };
struct C : A { int m; }; struct C : A { int m; };
......
// 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> // Contributed by Nathan Sidwell 6 Jun 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
// D--B--A // D--B--A
// +--C<<A // +--C<<A
// Special g++ Options: -w
struct A { int m; }; struct A { int m; };
struct B : A { int m; }; struct B : A { int m; };
struct C : private A { int m; }; struct C : private A { int m; };
......
// 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> // Contributed by Nathan Sidwell 6 Jun 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
// D--B--A // D--B--A
// +--C<<A // +--C<<A
// Special g++ Options: -w
struct A { int m; virtual ~A(){}}; struct A { int m; virtual ~A(){}};
struct B : A { int m; }; struct B : A { int m; };
struct C : private A { int m; }; struct C : private A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
// D==B--A // D==B--A
// +==C--A // +==C--A
// Special g++ Options: -w
struct A { int m; }; struct A { int m; };
struct B : A { int m; }; struct B : A { int m; };
struct C : A { int m; }; struct C : A { int m; };
......
// 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> // Contributed by Nathan Sidwell 29 Aug 1999 <nathan@acm.org>
// We cannot catch an ambiguous base class. // We cannot catch an ambiguous base class.
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
// D==B--A // D==B--A
// +==C--A // +==C--A
// Special g++ Options: -w
struct A { int m; virtual ~A(){}}; struct A { int m; virtual ~A(){}};
struct B : A { int m; }; struct B : A { int m; };
struct C : A { int m; }; struct C : A { int m; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment