aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/typeck.c
diff options
context:
space:
mode:
authorMagnus Fromreide <magfr@lysator.liu.se>2010-06-05 06:52:18 +0200
committerJason Merrill <jason@gcc.gnu.org>2010-06-05 00:52:18 -0400
commit33c2474d7055ff84f60b57727b640cbaa7dd8caa (patch)
treea75627256e95c2e08ea8e6ff3a77847ccbf4c289 /gcc/cp/typeck.c
parent247078ec4ddf45f168329c23187f480355b43f90 (diff)
downloadgcc-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/typeck.c')
-rw-r--r--gcc/cp/typeck.c2
1 files changed, 1 insertions, 1 deletions
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,