steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: fix types after rebase

db4
Joe Groff 2011-12-13 12:27:39 -08:00
parent 604ceb957c
commit 2f20ee6fb0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vm/code_heap.cpp
View File

@ -79,10 +79,10 @@ struct clear_free_blocks_from_all_blocks_iterator
clear_free_blocks_from_all_blocks_iterator(code_heap *code) : code(code) {} clear_free_blocks_from_all_blocks_iterator(code_heap *code) : code(code) {}
void operator()(code_block *free_block, cell size) { void operator()(code_block *free_block, cell size) {
std::set<code_block*>::iterator erase_from = std::set<cell>::iterator erase_from =
code->all_blocks.lower_bound(free_block); code->all_blocks.lower_bound((cell)free_block);
std::set<code_block*>::iterator erase_to = std::set<cell>::iterator erase_to =
code->all_blocks.lower_bound((code_block*)((char*)free_block + size)); code->all_blocks.lower_bound((cell)free_block + size);
code->all_blocks.erase(erase_from, erase_to); 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) code_block *code_heap::code_block_for_address(cell address)
{ {
std::set<cell>::const_iterator blocki = std::set<cell>::const_iterator blocki =
all_blocks.upper_bound((code_block*)address); all_blocks.upper_bound(address);
FACTOR_ASSERT(blocki != all_blocks.begin()); FACTOR_ASSERT(blocki != all_blocks.begin());
--blocki; --blocki;
code_block* found_block = (code_block*)*blocki; code_block* found_block = (code_block*)*blocki;