From 6c3d4e0b1eac6a102922dd35f1ce0fa5cf8a14e8 Mon Sep 17 00:00:00 2001
From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 20 Dec 2005 04:59:42 +0000
Subject: [PATCH] 	PR c++/24278 	* init.c (expand_member_init): Print
 messages about baseclasses 	using %T rather than %D. 	PR c++/24278 
 * g++.dg/template/ctor5.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108840 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                      | 4 ++++
 gcc/cp/init.c                         | 8 ++++----
 gcc/testsuite/ChangeLog               | 3 +++
 gcc/testsuite/g++.dg/template/ctor5.C | 8 ++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/ctor5.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c79990..2b3c175 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-19  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/24278
+	* init.c (expand_member_init): Print messages about baseclasses
+	using %T rather than %D.
+
 	PR c++/24915
 	* class.c (add_method): Do not treat templates as identical unless
 	their return types are the same.
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index f438467..f19842d 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1019,11 +1019,11 @@ expand_member_init (tree name)
       if (!direct_binfo && !virtual_binfo)
 	{
 	  if (CLASSTYPE_VBASECLASSES (current_class_type))
-	    error ("type %qD is not a direct or virtual base of %qT",
-		   name, current_class_type);
+	    error ("type %qT is not a direct or virtual base of %qT",
+		   basetype, current_class_type);
 	  else
-	    error ("type %qD is not a direct base of %qT",
-		   name, current_class_type);
+	    error ("type %qT is not a direct base of %qT",
+		   basetype, current_class_type);
 	  return NULL_TREE;
 	}
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e87eb1d..fe6953e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-19  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/24278
+	* g++.dg/template/ctor5.C: New test.
+
 	PR c++/24915
 	* g++.dg/template/overload8.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/template/ctor5.C b/gcc/testsuite/g++.dg/template/ctor5.C
new file mode 100644
index 0000000..18e55d1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ctor5.C
@@ -0,0 +1,8 @@
+// PR c++/24278
+
+template<typename T> struct A
+{
+  A() : T(0) {} // { dg-error "base" }
+};
+
+A<int*> a; // { dg-error "instantiated" }
-- 
2.7.4