From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 5 Feb 2004 19:45:47 +0000 (+0000)
Subject: re PR c++/13714 (destructor name `const s' does not match type `const s' of expression)
X-Git-Tag: releases/gcc-4.0.0~10345
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fca00ffb4906ca75f781985572ca63fc222126c8;p=thirdparty%2Fgcc.git

re PR c++/13714 (destructor name `const s' does not match type `const s' of expression)

	PR c++/13714
	* typeck.c (lookup_destructor): Tweak error message.

From-SVN: r77334
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e1d559fbb244..636fb21bc776 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-05  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13714
+	* typeck.c (lookup_destructor): Tweak error message.
+
 2004-02-05  Jan Hubicka  <jh@suse.cz>
 
 	* tree.c (cp_cannot_inline_tree_fn):  Allow inlining of comdat
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index c6d273a6170a..4082a1b23b08 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1801,8 +1801,8 @@ lookup_destructor (tree object, tree scope, tree dtor_name)
     }
   if (!same_type_p (dtor_type, TYPE_MAIN_VARIANT (object_type)))
     {
-      error ("destructor name `%T' does not match type `%T' of expression",
-	     dtor_type, object_type);
+      error ("the type being destroyed is '%T', but the destructor refers to `%T'",
+	     TYPE_MAIN_VARIANT (object_type), dtor_type);
       return error_mark_node;
     }
   if (!TYPE_HAS_DESTRUCTOR (object_type))