From 081cc1f74447392d403231039335839f4b2c92a5 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sun, 24 Jan 1999 15:56:46 +0000 Subject: [PATCH] * cvt.c (cp_convert_to_pointer): Fix conversion of 0 to pmf. From-SVN: r24850 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/cvt.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4a0a402009d..443c5de67e3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1999-01-24 Jason Merrill + + * cvt.c (cp_convert_to_pointer): Fix conversion of 0 to pmf. + 1999-01-25 Martin von Loewis * decl.c (decls_match): Return 1 if old and new are identical. diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 2b0cd53a68a..b73020f68d4 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -226,7 +226,7 @@ cp_convert_to_pointer (type, expr) if (integer_zerop (expr)) { if (TYPE_PTRMEMFUNC_P (type)) - return build_ptrmemfunc (type, expr, 0); + return build_ptrmemfunc (TYPE_PTRMEMFUNC_FN_TYPE (type), expr, 0); expr = build_int_2 (0, 0); TREE_TYPE (expr) = type; return expr; -- 2.30.2