diff options
author | Craig Earls <enderw88@gmail.com> | 2014-05-18 08:25:30 -0700 |
---|---|---|
committer | Craig Earls <enderw88@gmail.com> | 2014-05-18 08:25:30 -0700 |
commit | 8e6cdcc1d13533252b1f6e6088dca966b64e4c88 (patch) | |
tree | 8f8fd4f644f292a25fb79d59961e135cc4b11c3a /src/journal.cc | |
parent | d82c1b4b5531c7be1c1870a07f1836b230a4da27 (diff) | |
parent | 4af2b97921a68a522135f958f1999ec4b63435bb (diff) | |
download | fork-ledger-8e6cdcc1d13533252b1f6e6088dca966b64e4c88.tar.gz fork-ledger-8e6cdcc1d13533252b1f6e6088dca966b64e4c88.tar.bz2 fork-ledger-8e6cdcc1d13533252b1f6e6088dca966b64e4c88.zip |
Merge branch 'master' of https://github.com/ledger/ledger
Diffstat (limited to 'src/journal.cc')
-rw-r--r-- | src/journal.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal.cc b/src/journal.cc index ced96ee9..b11b5c45 100644 --- a/src/journal.cc +++ b/src/journal.cc @@ -174,7 +174,7 @@ account_t * journal_t::expand_aliases(string name) { // prevent infinite excursion. Each alias may only be expanded at most once. account_t * result = NULL; - if(no_aliases) + if (no_aliases) return result; bool keep_expanding = true; @@ -184,7 +184,7 @@ account_t * journal_t::expand_aliases(string name) { if (account_aliases.size() > 0) { accounts_map::const_iterator i = account_aliases.find(name); if (i != account_aliases.end()) { - if(std::find(already_seen.begin(), already_seen.end(), name) != already_seen.end()) { + if (std::find(already_seen.begin(), already_seen.end(), name) != already_seen.end()) { throw_(std::runtime_error, _f("Infinite recursion on alias expansion for %1%") % name); @@ -197,11 +197,11 @@ account_t * journal_t::expand_aliases(string name) { // only check the very first account for alias expansion, in case // that can be expanded successfully size_t colon = name.find(':'); - if(colon != string::npos) { + if (colon != string::npos) { string first_account_name = name.substr(0, colon); accounts_map::const_iterator j = account_aliases.find(first_account_name); if (j != account_aliases.end()) { - if(std::find(already_seen.begin(), already_seen.end(), first_account_name) != already_seen.end()) { + if (std::find(already_seen.begin(), already_seen.end(), first_account_name) != already_seen.end()) { throw_(std::runtime_error, _f("Infinite recursion on alias expansion for %1%") % first_account_name); |