diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-20 21:33:23 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-20 21:33:23 -0500 |
| commit | 117dddabd4f883de4f464821f9567d889a6fa449 (patch) | |
| tree | 602c8c5e72b81ffc9bcf01bbaed5e2875d0e60a0 /src/value.cc | |
| parent | cc9110a43a1e2d006de8d24a84bbfb2c6918cf33 (diff) | |
| parent | 4e6ec09e4d2a69dcb06627e44512980b09561448 (diff) | |
| download | fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.tar.gz fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.tar.bz2 fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.zip | |
Merge branch 'next'
Diffstat (limited to 'src/value.cc')
| -rw-r--r-- | src/value.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/value.cc b/src/value.cc index f4df3329..e2e748f4 100644 --- a/src/value.cc +++ b/src/value.cc @@ -1353,7 +1353,8 @@ value_t value_t::exchange_commodities(const std::string& commodities, p; p = std::strtok(NULL, ",")) { if (commodity_t * commodity = - amount_t::current_pool->parse_price_expression(p, add_prices, moment)) { + commodity_pool_t::current_pool->parse_price_expression(p, add_prices, + moment)) { value_t result = value(false, moment, *commodity); if (! result.is_null()) return result; @@ -1523,10 +1524,10 @@ void value_t::annotate(const annotation_t& details) throw_(value_error, _("Cannot annotate %1") << label()); } -bool value_t::is_annotated() const +bool value_t::has_annotation() const { if (is_amount()) - return as_amount().is_annotated(); + return as_amount().has_annotation(); else throw_(value_error, _("Cannot determine whether %1 is annotated") << label()); |