diff options
| author | Magnus Fromreide <magfr@lysator.liu.se> | 2010-06-05 06:52:18 +0200 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-06-05 00:52:18 -0400 |
| commit | 33c2474d7055ff84f60b57727b640cbaa7dd8caa (patch) | |
| tree | a75627256e95c2e08ea8e6ff3a77847ccbf4c289 /gcc/cp | |
| parent | 247078ec4ddf45f168329c23187f480355b43f90 (diff) | |
| download | gcc-33c2474d7055ff84f60b57727b640cbaa7dd8caa.zip gcc-33c2474d7055ff84f60b57727b640cbaa7dd8caa.tar.gz gcc-33c2474d7055ff84f60b57727b640cbaa7dd8caa.tar.bz2 | |
cvt.c (cp_convert_to_pointer): Use null_ptr_cst_p.
* cvt.c (cp_convert_to_pointer): Use null_ptr_cst_p.
* typeck.c (build_ptrmemfunc): Likewise.
From-SVN: r160309
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 2 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b051079..9c4ad0a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-06-04 Magnus Fromreide <magfr@lysator.liu.se> + + * cvt.c (cp_convert_to_pointer): Use null_ptr_cst_p. + * typeck.c (build_ptrmemfunc): Likewise. + 2010-06-04 Jason Merrill <jason@redhat.com> * typeck2.c (merge_exception_specifiers): Adjust merging of diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 71315b1..4aee151 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -196,7 +196,7 @@ cp_convert_to_pointer (tree type, tree expr) return error_mark_node; } - if (integer_zerop (expr)) + if (null_ptr_cst_p (expr)) { if (TYPE_PTRMEMFUNC_P (type)) return build_ptrmemfunc (TYPE_PTRMEMFUNC_FN_TYPE (type), expr, 0, diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 26ffe1c..53e84cf 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -7039,7 +7039,7 @@ build_ptrmemfunc (tree type, tree pfn, int force, bool c_cast_p) } /* Handle null pointer to member function conversions. */ - if (integer_zerop (pfn)) + if (null_ptr_cst_p (pfn)) { pfn = build_c_cast (input_location, type, integer_zero_node); return build_ptrmemfunc1 (to_type, |