backport: re PR c++/13932 (duplicate warning message for conversion)

	Backport from mainline
	2004-02-04  Mark Mitchell  <mark@codesourcery.com>
	PR c++/13932
	* call.c (convert_like_real): Use "converting" rather than
	"argument" as the descriptive keyword to
	dubious_conversion_warnings.
	* typeck.c (convert_for_assignment): Do not call
	dubious_conversion_warnings.

From-SVN: r78264

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4415bda7aa70de982e48997e9191218385bf140e..4feed3fa4e82604e3cd8bc90b350e91f3ea56779 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2004-02-22  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+       Backport from mainline
+       2004-02-04  Mark Mitchell  <mark@codesourcery.com>
+       PR c++/13932
+       * call.c (convert_like_real): Use "converting" rather than
+       "argument" as the descriptive keyword to
+       dubious_conversion_warnings.
+       * typeck.c (convert_for_assignment): Do not call
+       dubious_conversion_warnings.
+
 2004-02-22  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        Backport from mainline

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 89fc25790f24e12939917173ca42dfa047d3ef58..9971c3305d60eb06d96ceee5b5bddf8b5598b975 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4097,7 +4097,7 @@ convert_like_real (tree convs, tree expr, tree fn, int argnum, int inner,
   
   if (issue_conversion_warnings)
     expr = dubious_conversion_warnings
-             (totype, expr, "argument", fn, argnum);
+             (totype, expr, "converting", fn, argnum);
   switch (TREE_CODE (convs))
     {
     case USER_CONV:

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index a306b17c2982d31901d6dec22fe2a81df5bb8e9f..98da207a922beece5bfff71bc612550286a872f8 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -5937,8 +5937,6 @@ convert_for_assignment (type, rhs, errtype, fndecl, parmnum)
   if (TREE_CODE (rhs) == TREE_LIST && TREE_VALUE (rhs) == error_mark_node)
     return error_mark_node;
 
-  rhs = dubious_conversion_warnings (type, rhs, errtype, fndecl, parmnum);
-
   /* The RHS of an assignment cannot have void type.  */
   if (coder == VOID_TYPE)
     {