From 9252c5f1f3d3e34998129be3f7e9f8521ae591f8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Jan 2013 18:14:34 -0600 Subject: [PATCH] Revert "Bug551 fixed, commodities and accounts now sort" This reverts commit 67a598f6ff3b9b19b08af108c8bfe26064728457. --- src/account.h | 7 ------- src/commodity.h | 7 ------- src/output.h | 4 ++-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/account.h b/src/account.h index 3642ada0..a2fcb8de 100644 --- a/src/account.h +++ b/src/account.h @@ -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, function 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 #endif // _ACCOUNT_H diff --git a/src/commodity.h b/src/commodity.h index 37b02e74..ab496850 100644 --- a/src/commodity.h +++ b/src/commodity.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, 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 #endif // _COMMODITY_H diff --git a/src/output.h b/src/output.h index 5ce9dc58..281f69b6 100644 --- a/src/output.h +++ b/src/output.h @@ -142,7 +142,7 @@ class report_accounts : public item_handler protected: report_t& report; - std::map accounts; + std::map accounts; typedef std::map::value_type accounts_pair; @@ -194,7 +194,7 @@ class report_commodities : public item_handler protected: report_t& report; - std::map commodities; + std::map commodities; typedef std::map::value_type commodities_pair;