summaryrefslogtreecommitdiff
path: root/src/iterators.h
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-10-26 19:09:24 -0400
committerJohn Wiegley <johnw@newartisans.com>2009-10-26 19:09:24 -0400
commit7fae606d622d8cd463ce5f81f5d7872a4fdebc60 (patch)
treebe5550e492b20c135143c821fbc18cbd63c27060 /src/iterators.h
parent92d1bbbe75df71731d458f5b48bcb0f145428920 (diff)
parent3fdd75fb5b2614f7dab29fd5ad5c9efed6e80b79 (diff)
downloadfork-ledger-7fae606d622d8cd463ce5f81f5d7872a4fdebc60.tar.gz
fork-ledger-7fae606d622d8cd463ce5f81f5d7872a4fdebc60.tar.bz2
fork-ledger-7fae606d622d8cd463ce5f81f5d7872a4fdebc60.zip
Merge branch 'next'
Diffstat (limited to 'src/iterators.h')
-rw-r--r--src/iterators.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/iterators.h b/src/iterators.h
index ae2ddaf9..a1563539 100644
--- a/src/iterators.h
+++ b/src/iterators.h
@@ -255,12 +255,8 @@ class sorted_accounts_iterator : public accounts_iterator
std::list<accounts_deque_t::const_iterator> sorted_accounts_end;
public:
- sorted_accounts_iterator(const expr_t& _sort_cmp, bool _flatten_all)
- : sort_cmp(_sort_cmp), flatten_all(_flatten_all) {
- TRACE_CTOR(sorted_accounts_iterator, "const expr_t&, bool");
- }
- sorted_accounts_iterator(const expr_t& _sort_cmp, bool _flatten_all,
- account_t& account)
+ sorted_accounts_iterator(account_t& account,
+ const expr_t& _sort_cmp, bool _flatten_all)
: sort_cmp(_sort_cmp), flatten_all(_flatten_all) {
TRACE_CTOR(sorted_accounts_iterator, "const expr_t&, bool, account_t&");
push_back(account);
@@ -269,9 +265,9 @@ public:
TRACE_DTOR(sorted_accounts_iterator);
}
- void sort_accounts(account_t& account, accounts_deque_t& deque);
- void push_all(account_t& account);
void push_back(account_t& account);
+ void push_all(account_t& account, accounts_deque_t& deque);
+ void sort_accounts(account_t& account, accounts_deque_t& deque);
virtual account_t * operator()();
};