diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-03 12:09:23 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-03 12:09:23 -0500 |
| commit | 94b2518c4156e5a6b2be45bdbeeacf1ced0cd17f (patch) | |
| tree | bed7d794e70294347d4f0eca7159a2eed5743543 /src/amount.cc | |
| parent | 46e46dd5a337c009391583a679d6172cf4f5aa42 (diff) | |
| parent | f6f8ef1ba6164622f38b91bf10e0c1a0e7e8f9e3 (diff) | |
| download | ledger-94b2518c4156e5a6b2be45bdbeeacf1ced0cd17f.tar.gz ledger-94b2518c4156e5a6b2be45bdbeeacf1ced0cd17f.tar.bz2 ledger-94b2518c4156e5a6b2be45bdbeeacf1ced0cd17f.zip | |
Merge branch 'next'
Diffstat (limited to 'src/amount.cc')
| -rw-r--r-- | src/amount.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/amount.cc b/src/amount.cc index 435cdea4..e9b971f8 100644 --- a/src/amount.cc +++ b/src/amount.cc @@ -770,7 +770,7 @@ commodity_t& amount_t::commodity() const bool amount_t::has_commodity() const { - return commodity_ && commodity_ != commodity_->parent().null_commodity; + return commodity_ && commodity_ != commodity_->pool().null_commodity; } void amount_t::annotate(const annotation_t& details) @@ -795,7 +795,7 @@ void amount_t::annotate(const annotation_t& details) << *this << std::endl << details); if (commodity_t * ann_comm = - this_base->parent().find_or_create(*this_base, details)) + this_base->pool().find_or_create(*this_base, details)) set_commodity(*ann_comm); #ifdef ASSERTS_ON else |