From b7b4c079266e0e9ef18dbe006a4a135643cf890b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 8 Jun 2007 04:13:20 +0000 Subject: r384@user1022: johnw | 2007-06-08 00:08:53 -0400 Corrected several minor warnings --- src/data/journal.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/data/journal.cc') 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(*i) < item_pool || + reinterpret_cast(*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(*i) < item_pool || + reinterpret_cast(*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(*i) < item_pool || + reinterpret_cast(*i) >= item_pool_end) checked_delete(*i); else (*i)->~period_entry_t(); -- cgit v1.2.3