* cvt.c (cp_convert_to_pointer): Fix conversion of 0 to pmf.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24850 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4a0a402..443c5de 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1999-01-24  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * cvt.c (cp_convert_to_pointer): Fix conversion of 0 to pmf.
+
 1999-01-25  Martin von Loewis  <loewis@informatik.hu-berlin.de>
 
        * 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 2b0cd53..b73020f 100644 (file)
--- 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;