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/commodity.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/commodity.cc')
| -rw-r--r-- | src/commodity.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/commodity.cc b/src/commodity.cc index b76c7896..79ed77fe 100644 --- a/src/commodity.cc +++ b/src/commodity.cc @@ -600,11 +600,11 @@ bool compare_amount_commodities::operator()(const amount_t * left, if (cmp != 0) return cmp < 0; - if (! leftcomm.is_annotated()) { - return rightcomm.is_annotated(); + if (! leftcomm.has_annotation()) { + return rightcomm.has_annotation(); } - else if (! rightcomm.is_annotated()) { - return ! leftcomm.is_annotated(); + else if (! rightcomm.has_annotation()) { + return ! leftcomm.has_annotation(); } else { annotated_commodity_t& aleftcomm(static_cast<annotated_commodity_t&>(leftcomm)); @@ -675,7 +675,7 @@ void to_xml(std::ostream& out, const commodity_t& comm, } if (commodity_details) { - if (comm.is_annotated()) + if (comm.has_annotation()) to_xml(out, as_annotated_commodity(comm).details); if (comm.varied_history()) { |