diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-13 21:16:42 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-13 21:16:42 +0000 |
| commit | d1cabdaf4ba3b3e7c31140b29cf0d9b1f1249ff7 (patch) | |
| tree | c3d1036d74074e85d94f2d2cea5f24ae690d935a /gcc/cp/expr.c | |
| parent | f388bf5f72c80587bcdae99a9dd29865b7357ca4 (diff) | |
| download | gcc-d1cabdaf4ba3b3e7c31140b29cf0d9b1f1249ff7.tar.gz | |
* cp-tree.h (DELTA2_FROM_PTRMEMFUNC): Remove.
(expand_ptremfunc_cst): Change prototype.
(delta2_from_ptrmemfunc): Remove.
* expr.c (cplus_expand_constant): Adjust call to
expand_ptrmemfunc_cst.
* typeck.c (build_ptrmemfunc1): Simplify.
(build_ptrmemfunc): Make sure that casting a PTRMEM_CST still
results in a constant.
(expand_ptrmemfunc_cst): Remove idx and delta2 parameters.
(delta2_from_ptrmemfunc): Remove.
(pfn_from_ptrmemfunc): Adjust call to expand_ptrmemfunc_cst.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41341 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/expr.c')
| -rw-r--r-- | gcc/cp/expr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c index 9a9eb86f526..6855160fc19 100644 --- a/gcc/cp/expr.c +++ b/gcc/cp/expr.c @@ -60,9 +60,10 @@ cplus_expand_constant (cst) } else { - tree delta, idx, pfn, delta2; + tree delta; + tree pfn; - expand_ptrmemfunc_cst (cst, &delta, &idx, &pfn, &delta2); + expand_ptrmemfunc_cst (cst, &delta, &pfn); cst = build_ptrmemfunc1 (type, delta, pfn); } } |