diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/call.c | 2 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/conv2.C | 3 |
5 files changed, 18 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 083bebe..be3315e 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 0aa19f1..e6eded5 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 4f635cc..c6d273a 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) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6c3db3e..df3236f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-02-04 Mark Mitchell <mark@codesourcery.com> + + PR c++/13932 + * g++.dg/warn/conv2.C: New test. + 2004-02-04 Giovanni Bajo <giovannibajo@gcc.gnu.org> PR c++/13086 diff --git a/gcc/testsuite/g++.dg/warn/conv2.C b/gcc/testsuite/g++.dg/warn/conv2.C new file mode 100644 index 0000000..e346600 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/conv2.C @@ -0,0 +1,3 @@ +// PR c++/13932 + +int i = 1.; // { dg-warning "converting" } |