summaryrefslogtreecommitdiff
path: root/src/data/journal.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2007-06-08 04:13:20 +0000
committerJohn Wiegley <johnw@newartisans.com>2008-04-13 03:39:08 -0400
commitb7b4c079266e0e9ef18dbe006a4a135643cf890b (patch)
treec1196c1e39dc97024f9b306d564f7b1e0dac84d3 /src/data/journal.cc
parentec850814fdd6424db791ef79cab82eb2a2e5afbe (diff)
downloadfork-ledger-b7b4c079266e0e9ef18dbe006a4a135643cf890b.tar.gz
fork-ledger-b7b4c079266e0e9ef18dbe006a4a135643cf890b.tar.bz2
fork-ledger-b7b4c079266e0e9ef18dbe006a4a135643cf890b.zip
r384@user1022: johnw | 2007-06-08 00:08:53 -0400
Corrected several minor warnings
Diffstat (limited to 'src/data/journal.cc')
-rw-r--r--src/data/journal.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/data/journal.cc b/src/data/journal.cc
index 17294820..bb33f4dc 100644
--- a/src/data/journal.cc
+++ b/src/data/journal.cc
@@ -542,18 +542,22 @@ journal_t::~journal_t()
// be deleted.
for (entries_list::iterator i = entries.begin();
i != entries.end();
- i++)
+ i++) {
if (! item_pool ||
- ((char *) *i) < item_pool || ((char *) *i) >= item_pool_end)
+ reinterpret_cast<char *>(*i) < item_pool ||
+ reinterpret_cast<char *>(*i) >= item_pool_end) {
checked_delete(*i);
- else
+ } else {
(*i)->~entry_t();
+ }
+ }
for (auto_entries_list::iterator i = auto_entries.begin();
i != auto_entries.end();
i++)
if (! item_pool ||
- ((char *) *i) < item_pool || ((char *) *i) >= item_pool_end)
+ reinterpret_cast<char *>(*i) < item_pool ||
+ reinterpret_cast<char *>(*i) >= item_pool_end)
checked_delete(*i);
else
(*i)->~auto_entry_t();
@@ -562,7 +566,8 @@ journal_t::~journal_t()
i != period_entries.end();
i++)
if (! item_pool ||
- ((char *) *i) < item_pool || ((char *) *i) >= item_pool_end)
+ reinterpret_cast<char *>(*i) < item_pool ||
+ reinterpret_cast<char *>(*i) >= item_pool_end)
checked_delete(*i);
else
(*i)->~period_entry_t();