From 2f20ee6fb0ff0a03c96c4f3bb00c2e3a4cc45ac3 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 13 Dec 2011 12:27:39 -0800 Subject: [PATCH] vm: fix types after rebase --- vm/code_heap.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vm/code_heap.cpp b/vm/code_heap.cpp index 112769da7a..95cef61d76 100755 --- a/vm/code_heap.cpp +++ b/vm/code_heap.cpp @@ -79,10 +79,10 @@ struct clear_free_blocks_from_all_blocks_iterator clear_free_blocks_from_all_blocks_iterator(code_heap *code) : code(code) {} void operator()(code_block *free_block, cell size) { - std::set::iterator erase_from = - code->all_blocks.lower_bound(free_block); - std::set::iterator erase_to = - code->all_blocks.lower_bound((code_block*)((char*)free_block + size)); + std::set::iterator erase_from = + code->all_blocks.lower_bound((cell)free_block); + std::set::iterator erase_to = + code->all_blocks.lower_bound((cell)free_block + size); code->all_blocks.erase(erase_from, erase_to); } @@ -118,7 +118,7 @@ void code_heap::verify_all_blocks_set() code_block *code_heap::code_block_for_address(cell address) { std::set::const_iterator blocki = - all_blocks.upper_bound((code_block*)address); + all_blocks.upper_bound(address); FACTOR_ASSERT(blocki != all_blocks.begin()); --blocki; code_block* found_block = (code_block*)*blocki;