From 530ec96d294a83afc075059b13eb72cc07d9465d Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 13 Apr 2001 21:16:42 +0000 Subject: cp-tree.h (DELTA2_FROM_PTRMEMFUNC): Remove. * 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. From-SVN: r41341 --- gcc/cp/expr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gcc/cp/expr.c') diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c index 9a9eb86..6855160 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); } } -- cgit v1.1