diff options
Diffstat (limited to 'src/xact.cc')
| -rw-r--r-- | src/xact.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/xact.cc b/src/xact.cc index 93e66369..83e36078 100644 --- a/src/xact.cc +++ b/src/xact.cc @@ -157,7 +157,7 @@ namespace { value_t get_cost(xact_t& xact) { if (xact.has_xdata() && xact.xdata().has_flags(XACT_EXT_COMPOUND)) { - return xact.xdata().value.cost(); + return xact.xdata().value; } else { if (xact.cost) return *xact.cost; @@ -173,18 +173,11 @@ namespace { return xact.amount; } - value_t get_total_cost(xact_t& xact) { + value_t get_count(xact_t& xact) { if (xact.xdata_) - return xact.xdata_->total.cost(); - else if (xact.cost) - return *xact.cost; + return xact.xdata_->count; else - return xact.amount; - } - - value_t get_count(xact_t& xact) { - assert(xact.xdata_); - return xact.xdata_->count; + return 1L; } value_t get_account(call_scope_t& scope) @@ -260,8 +253,6 @@ expr_t::ptr_op_t xact_t::lookup(const string& name) case 't': if (name[1] == '\0' || name == "total") return WRAP_FUNCTOR(get_wrapper<&get_total>); - else if (name == "total_cost") - return WRAP_FUNCTOR(get_wrapper<&get_total_cost>); break; case 'v': |