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, 30 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/ptrmem10.C b/gcc/testsuite/g++.old-deja/g++.pt/ptrmem10.C
new file mode 100644
index 000000000..6d61079b4
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/ptrmem10.C
@@ -0,0 +1,30 @@
+// { dg-do assemble  }
+// 
+// Copyright (C) 2000 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 14 Aug 2000 <nathan@codesourcery.com>
+
+// A pointer to member can only be formed by `&T::m', however, other forms
+// are ok for pointer to static member. Thus the error can only be determined
+// after overload resolution. In template deduction, this can disambiguate
+// otherwise ambiguous cases.
+
+struct A
+{
+  static int f (int);
+  int f (short);
+  void baz ();
+};
+
+template <typename T> void foo (int (*)(T));      // { dg-message "note" } 
+template <typename T> void foo (int (A::*)(T));   // { dg-message "note" } candidate
+
+
+void A::baz ()
+{
+  foo (&A::f);  // { dg-error "ambiguous" } 
+  // { dg-message "candidate" "candidate note" { target *-*-* } 24 }
+  foo (A::f);
+  foo (&(A::f));
+  foo (f);
+  foo (&f);
+}