obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 22 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.martin/ambig1.C b/gcc/testsuite/g++.old-deja/g++.martin/ambig1.C
new file mode 100644
index 000000000..1ccc217a4
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.martin/ambig1.C
@@ -0,0 +1,22 @@
+// { dg-do assemble  }
+//Based on a report by Bill Currie <bcurrie@tssc.co.nz>
+struct foo {
+  protected:
+    int x;        // { dg-error "" } candidate
+};
+
+struct bar {
+  public:
+    int x();      // { dg-error "" } candidate
+};
+
+struct foobar: public foo, public bar {
+  foobar();
+};
+
+int func(int);
+
+foobar::foobar()
+{
+    func(x);       // { dg-error "" } ambiguous member access
+}