From 7a925598cd29b439942866d5722cb2c3fbb92ea1 Mon Sep 17 00:00:00 2001
From: Giovanni Bajo <giovannibajo@libero.it>
Date: Wed, 8 Oct 2003 01:54:11 +0200
Subject: [PATCH] re PR c++/11097 (using template operator is broken)

	PR c++/11097
	* g++.dg/other/error5.C: Modify the error message.
	* g++.dg/lookup/using8.C: New test.

From-SVN: r72211
---
 gcc/testsuite/ChangeLog              |  6 ++++++
 gcc/testsuite/g++.dg/lookup/using8.C | 19 +++++++++++++++++++
 gcc/testsuite/g++.dg/other/error5.C  |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/lookup/using8.C

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4cf07755158..b1b28ccd587 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-08  Giovanni Bajo <giovannibajo@libero.it>
+
+	PR c++/11097
+	* g++.dg/other/error5.C: Modify the error message.
+	* g++.dg/lookup/using8.C: New test.
+
 2003-10-07  Geoffrey Keating  <geoffk@apple.com>
 
 	* gcc.dg/darwin-abi-2.c: New file.
diff --git a/gcc/testsuite/g++.dg/lookup/using8.C b/gcc/testsuite/g++.dg/lookup/using8.C
new file mode 100644
index 00000000000..26eb4d3252c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/using8.C
@@ -0,0 +1,19 @@
+// { dg-do compile }
+// Origin: Bill Clarke <llib at computer dot org>
+// PR c++/11097: using declartion for a converter operator to a nested class
+//  in a base type
+
+template <typename T>
+struct A
+{
+  struct Nested {};
+  operator Nested*();
+};
+
+template <typename T>
+struct B : A<T>
+{
+  using A<T>::operator typename A<T>::Nested*;
+};
+
+template struct B<int>;
diff --git a/gcc/testsuite/g++.dg/other/error5.C b/gcc/testsuite/g++.dg/other/error5.C
index 9cde29fc3d3..552f7bf27b5 100644
--- a/gcc/testsuite/g++.dg/other/error5.C
+++ b/gcc/testsuite/g++.dg/other/error5.C
@@ -7,7 +7,7 @@ template <typename T> struct S {
 };
 
 template <typename T> struct S2 : S<T> {
-    using S<T>::operator typename S<T>::I*; // { dg-error "operator S\\<T\\>" "" }
+    using S<T>::operator typename S<T>::I*; // { dg-error "operator S\\<int\\>" "" }
 };
 
 template struct S2<int>;  // { dg-error "instantiated" "" }
-- 
2.30.2