diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1999-01-24 15:56:46 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1999-01-24 10:56:46 -0500 |
| commit | 081cc1f74447392d403231039335839f4b2c92a5 (patch) | |
| tree | 6e2853ea16dd4af9a942fe8402ad79b36ce57ae8 /gcc | |
| parent | 347d73d7082681958142dcb57e60f2f45e7f8777 (diff) | |
| download | gcc-081cc1f74447392d403231039335839f4b2c92a5.zip gcc-081cc1f74447392d403231039335839f4b2c92a5.tar.gz gcc-081cc1f74447392d403231039335839f4b2c92a5.tar.bz2 | |
* cvt.c (cp_convert_to_pointer): Fix conversion of 0 to pmf.
From-SVN: r24850
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4a0a402..443c5de 100644 --- 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 --- 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; |