diff options
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 9fa2a665e15..f247699d22c 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -258,7 +258,7 @@ cp_convert_to_pointer (type, expr, force) if (TYPE_PTRMEMFUNC_P (type)) return build_ptrmemfunc (TYPE_PTRMEMFUNC_FN_TYPE (type), expr, 0); - if (flag_new_abi && TYPE_PTRMEM_P (type)) + if (TYPE_PTRMEM_P (type)) /* Under the new ABI, a NULL pointer-to-member is represented by -1, not by zero. */ expr = build_int_2 (-1, -1); @@ -1258,7 +1258,7 @@ type_promotes_to (type) else type = totype; } - else if (C_PROMOTING_INTEGER_TYPE_P (type)) + else if (c_promoting_integer_type_p (type)) { /* Retain unsignedness if really not getting bigger. */ if (TREE_UNSIGNED (type) |