aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/call.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-05-22 23:47:35 -0400
committerJason Merrill <jason@gcc.gnu.org>2013-05-22 23:47:35 -0400
commitda834cfcb0c8e59936cf3697b81b2693e5eb2ed0 (patch)
treef559f205ee21dd8d310cbaaaf0b783b7b4d16527 /gcc/cp/call.c
parent2701664a0266af935d5fea7c5586a5686fe32365 (diff)
downloadgcc-da834cfcb0c8e59936cf3697b81b2693e5eb2ed0.zip
gcc-da834cfcb0c8e59936cf3697b81b2693e5eb2ed0.tar.gz
gcc-da834cfcb0c8e59936cf3697b81b2693e5eb2ed0.tar.bz2
re PR c++/56930 (pointless -Wconversion warning with sizeof)
PR c++/56930 * call.c (convert_like_real): Use cp_convert_and_check. * cvt.c (cp_convert_and_check): Use maybe_constant_value. * semantics.c (cxx_eval_constant_expression): Handle LTGT_EXPR. (potential_constant_expression_1): Handle OMP_ATOMIC*. From-SVN: r199232
Diffstat (limited to 'gcc/cp/call.c')
-rw-r--r--gcc/cp/call.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 71a1589d..0b6a83f 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6199,10 +6199,10 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
if (convs->check_narrowing)
check_narrowing (totype, expr);
- if (issue_conversion_warnings && (complain & tf_warning))
- expr = convert_and_check (totype, expr);
+ if (issue_conversion_warnings)
+ expr = cp_convert_and_check (totype, expr, complain);
else
- expr = convert (totype, expr);
+ expr = cp_convert (totype, expr, complain);
return expr;
}