This commit was manufactured by cvs2svn to create branch

'gcc-3_4-branch'.

From-SVN: r91868

diff --git a/gcc/testsuite/g++.dg/lookup/name-clash4.C b/gcc/testsuite/g++.dg/lookup/name-clash4.C
new file mode 100644 (file)
index 0000000..d4ff551
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/name-clash4.C
@@ -0,0 +1,12 @@
+// { dg-do compile }
+
+// Origin: Volker Reichelt <reichelt@gcc.gnu.org>
+
+// PR c++/18100: Invalid nested type.
+
+struct A
+{
+    template<int> struct A {}; // { dg-error "same name" }
+};
+
+A::A<0> a;                     // { dg-error "not a template" }

diff --git a/gcc/testsuite/g++.dg/template/operator5.C b/gcc/testsuite/g++.dg/template/operator5.C
new file mode 100644 (file)
index 0000000..1c0c292
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/operator5.C
@@ -0,0 +1,14 @@
+// Copyright (C) 2004 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 7 Dec 2004 <nathan@codesourcery.com>
+
+// PR 18803: reject legal
+// Origin: Wolfgang Bangerth <bangerth@dealii.org>
+
+struct A { 
+  int operator() (); 
+}; 
+ 
+template <int> void foo () { 
+  A &a = *new A(); 
+  const int i = a(); 
+}