Revert "Bug551 fixed, commodities and accounts now sort"
This reverts commit 67a598f6ff.
This commit is contained in:
parent
d1c96190e9
commit
9252c5f1f3
3 changed files with 2 additions and 16 deletions
|
|
@ -308,13 +308,6 @@ std::ostream& operator<<(std::ostream& out, const account_t& account);
|
||||||
void put_account(property_tree::ptree& pt, const account_t& acct,
|
void put_account(property_tree::ptree& pt, const account_t& acct,
|
||||||
function<bool(const account_t&)> pred);
|
function<bool(const account_t&)> pred);
|
||||||
|
|
||||||
//simple struct added to allow std::map to compare accounts in the accounts report
|
|
||||||
struct account_compare {
|
|
||||||
bool operator() (const account_t& lhs, const account_t& rhs){
|
|
||||||
return (lhs.fullname().compare(rhs.fullname()) < 0);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace ledger
|
} // namespace ledger
|
||||||
|
|
||||||
#endif // _ACCOUNT_H
|
#endif // _ACCOUNT_H
|
||||||
|
|
|
||||||
|
|
@ -349,13 +349,6 @@ inline std::ostream& operator<<(std::ostream& out, const commodity_t& comm) {
|
||||||
void put_commodity(property_tree::ptree& pt, const commodity_t& comm,
|
void put_commodity(property_tree::ptree& pt, const commodity_t& comm,
|
||||||
bool commodity_details = false);
|
bool commodity_details = false);
|
||||||
|
|
||||||
//simple struct to allow std::map to compare commodities names
|
|
||||||
struct commodity_compare {
|
|
||||||
bool operator() (const commodity_t* lhs, const commodity_t* rhs){
|
|
||||||
return (lhs->symbol().compare(rhs->symbol()) < 0);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace ledger
|
} // namespace ledger
|
||||||
|
|
||||||
#endif // _COMMODITY_H
|
#endif // _COMMODITY_H
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ class report_accounts : public item_handler<post_t>
|
||||||
protected:
|
protected:
|
||||||
report_t& report;
|
report_t& report;
|
||||||
|
|
||||||
std::map<account_t *, std::size_t, account_compare> accounts;
|
std::map<account_t *, std::size_t> accounts;
|
||||||
|
|
||||||
typedef std::map<account_t *, std::size_t>::value_type accounts_pair;
|
typedef std::map<account_t *, std::size_t>::value_type accounts_pair;
|
||||||
|
|
||||||
|
|
@ -194,7 +194,7 @@ class report_commodities : public item_handler<post_t>
|
||||||
protected:
|
protected:
|
||||||
report_t& report;
|
report_t& report;
|
||||||
|
|
||||||
std::map<commodity_t *, std::size_t, commodity_compare> commodities;
|
std::map<commodity_t *, std::size_t> commodities;
|
||||||
|
|
||||||
typedef std::map<commodity_t *, std::size_t>::value_type commodities_pair;
|
typedef std::map<commodity_t *, std::size_t>::value_type commodities_pair;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue