summaryrefslogtreecommitdiffstats
path: root/gcc/cp
diff options
context:
space:
mode:
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>2004-02-05 05:22:21 +0000
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>2004-02-05 05:22:21 +0000
commitf1b317297237b668e8436c27fa9b35216068e6df (patch)
tree92dbe1ba12925bb7f2269dd4dc61d69a4071032e /gcc/cp
parent007f9998410773f204964208acc9ad18ccc98f64 (diff)
downloadppe42-gcc-f1b317297237b668e8436c27fa9b35216068e6df.tar.gz
ppe42-gcc-f1b317297237b668e8436c27fa9b35216068e6df.zip
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. PR c++/13932 * g++.dg/warn/conv2.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77297 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog9
-rw-r--r--gcc/cp/call.c2
-rw-r--r--gcc/cp/typeck.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 083bebe540d..be3315eef96 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+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-04 Giovanni Bajo <giovannibajo@gcc.gnu.org>
PR c++/13086
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 0aa19f12643..e6eded59add 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3900,7 +3900,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 4f635cc7b55..c6d273a6170 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -5642,8 +5642,6 @@ convert_for_assignment (tree type, tree rhs,
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)
{
OpenPOWER on IntegriCloud