From 691125710d580d96e6c94f04fe0e1205507ee899 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Fri, 23 Jun 2000 02:45:58 -0400
Subject: [PATCH] new

From-SVN: r34658
---
 gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C |  7 +++----
 gcc/testsuite/g++.old-deja/g++.pt/ttp60.C     | 14 ++++++++++++++
 gcc/testsuite/g++.old-deja/g++.pt/ttp61.C     |  9 +++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.old-deja/g++.pt/ttp60.C
 create mode 100644 gcc/testsuite/g++.old-deja/g++.pt/ttp61.C

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C
index 768b374..6db9b4b 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C
@@ -1,7 +1,7 @@
 // Build don't link:
 
 // by Paul Burchard <burchard@pobox.com>, Level Set Systems, Inc.
-// Copyright (C) 1999 Free Software Foundation
+// Copyright (C) 1999, 2000 Free Software Foundation
 
 class Q {
 	template<class T>
@@ -10,7 +10,6 @@ class Q {
 };
 template<template<class> class XX>
 class Y {
-	XX<int> x_;		// ERROR - Q::X not a template
+	XX<int> x_;		// ERROR - Q::X inaccessible XFAIL *-*-*
 };
-Y<Q::X> y;			// ERROR - instantiated from here
-
+Y<Q::X> y;			// ERROR - instantiated from here XFAIL *-*-*
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/ttp60.C b/gcc/testsuite/g++.old-deja/g++.pt/ttp60.C
new file mode 100644
index 0000000..856d0f5
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/ttp60.C
@@ -0,0 +1,14 @@
+// Origin: "Marcin 'Qrczak' Kowalczyk" <qrczak@knm.org.pl>
+// Build don't link:
+
+template<template<typename> class t1, typename t0> t1<t0> single()
+{
+    return single<t1,t0>();
+}
+
+template<typename a> class T1 {};
+int main()
+{
+    single<T1,int>();
+}
+
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/ttp61.C b/gcc/testsuite/g++.old-deja/g++.pt/ttp61.C
new file mode 100644
index 0000000..eb1f02c
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/ttp61.C
@@ -0,0 +1,9 @@
+// Origin: grg at ai dot mit dot edu
+// Build don't link:
+
+class A;
+template<template<class Ignored> class base> class C : 
+                                      public base<A> {
+ public:
+    C(A& newa) : base<A>(newa) {}
+};
-- 
2.7.4