sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #408 from kk12l/next

Browse source 
Fix clang compile error (FreeBSD 10).
This commit is contained in:
Alexis Hildebrandt 2015-03-13 14:13:57 +01:00
commit c7fa772310
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output.cc
View file

@ -291,7 +291,7 @@ void report_accounts::flush()
void report_accounts::operator()(post_t& post)
{
std::map<account_t *, std::size_t>::iterator i = accounts.find(post.account);
accounts_report_map::iterator i = accounts.find(post.account);
if (i == accounts.end())
accounts.insert(accounts_pair(post.account, 1));
else
@ -362,7 +362,7 @@ void report_commodities::operator()(post_t& post)
amount_t temp(post.amount.strip_annotations(report.what_to_keep()));
commodity_t& comm(temp.commodity());
std::map<commodity_t *, std::size_t>::iterator i = commodities.find(&comm);
commodities_report_map::iterator i = commodities.find(&comm);
if (i == commodities.end())
commodities.insert(commodities_pair(&comm, 1));
else
@ -371,7 +371,7 @@ void report_commodities::operator()(post_t& post)
if (comm.has_annotation()) {
annotated_commodity_t& ann_comm(as_annotated_commodity(comm));
if (ann_comm.details.price) {
std::map<commodity_t *, std::size_t>::iterator ii =
commodities_report_map::iterator ii =
commodities.find(&ann_comm.details.price->commodity());
if (ii == commodities.end())
commodities.insert

10
src/output.h
View file

@ -142,9 +142,10 @@ class report_accounts : public item_handler<post_t>
protected:
report_t& report;
std::map<account_t *, std::size_t, account_compare> accounts;
typedef std::map<account_t *, std::size_t>::value_type accounts_pair;
typedef std::map<account_t *, std::size_t, account_compare> accounts_report_map;
accounts_report_map accounts;
public:
report_accounts(report_t& _report) : report(_report) {
@ -221,9 +222,10 @@ class report_commodities : public item_handler<post_t>
protected:
report_t& report;
std::map<commodity_t *, std::size_t, commodity_compare> commodities;
typedef std::map<commodity_t *, std::size_t>::value_type commodities_pair;
typedef std::map<commodity_t *, std::size_t, commodity_compare> commodities_report_map;
commodities_report_map commodities;
public:
report_commodities(report_t& _report) : report(_report) {