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

diff --git a/gcc/testsuite/g++.dg/template/friend31.C b/gcc/testsuite/g++.dg/template/friend31.C
new file mode 100644
index 000000000..5e60540b6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend31.C
@@ -0,0 +1,27 @@
+// { dg-do compile }
+
+// Origin: Ivan Godard <igodard@pacbell.net>
+
+// PR c++/15410: Declaration of friend class template with wrong
+// template parameter.
+
+template <typename T, typename U> struct F; // { dg-message "previous declaration" }
+
+class W
+{
+  template<int i> friend class F;	// { dg-error "template parameter" }
+  int x;                                // { dg-error "private" }
+};
+
+template <typename T, typename U> struct F
+{
+  void Look(W& w) { w.x = 3; }          // { dg-error "within this context" }
+};
+
+int main()
+{
+  W w;
+  F<char, bool> f;
+  f.Look(w);
+  return 0;
+}