This commit was manufactured by cvs2svn to create branch

'gcc-3_1-branch'.

From-SVN: r55042

diff --git a/gcc/testsuite/g++.dg/template/friend7.C b/gcc/testsuite/g++.dg/template/friend7.C
new file mode 100644 (file)
index 0000000..a954f89
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend7.C
@@ -0,0 +1,33 @@
+// { dg-do compile }
+
+template <typename V>
+struct b
+{
+  template <typename T>
+  class a
+  {
+    template <typename>
+    friend class a;
+
+    T t_;
+
+   public:
+    a() {}
+    a(a<T *> const &);
+  };
+};
+
+template <typename V>
+template <typename T>
+b<V>::a<T>::a(a<T *> const &rhs): t_(*rhs.t_)
+{}
+
+
+int
+f ()
+{
+  b<void *>::a<char *> q;
+  b<void *>::a<char> w(q);
+
+  return 0;
+}

diff --git a/gcc/testsuite/gcc.dg/Wunknownprag.c b/gcc/testsuite/gcc.dg/Wunknownprag.c
new file mode 100644 (file)
index 0000000..c5ba58f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wunknownprag.c
@@ -0,0 +1,11 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.  */
+
+/* { dg-do compile } */
+/* { dg-options "-Wunknown-pragmas" } */
+
+/* We used to get "unspellable token: CPP_EOF" warnings.  */
+
+#pragma                                /* { dg-warning "ignoring #pragma" } */
+#pragma ~                      /* { dg-warning "ignoring #pragma" } */
+#pragma baz                    /* { dg-warning "ignoring #pragma" } */
+#pragma baz baz                        /* { dg-warning "ignoring #pragma" } */