]> gitweb.factorcode.org Git - factor.git/commitdiff
Fix win64 compile error
authorSlava Pestov <slava@factorcode.org>
Sat, 9 Oct 2010 21:03:46 +0000 (16:03 -0500)
committerSlava Pestov <slava@factorcode.org>
Sat, 9 Oct 2010 21:03:46 +0000 (16:03 -0500)
vm/gc.cpp
vm/gc_info.hpp
vm/slot_visitor.hpp

index 0de3dac91f6d480c3d1d56eae3186b6e5afcccfd..1bb339a70ab7bd9c949db886d1685d3d789c2738 100755 (executable)
--- a/vm/gc.cpp
+++ b/vm/gc.cpp
@@ -230,8 +230,8 @@ struct call_frame_scrubber {
                gc_info *info = compiled->block_gc_info();
 
                assert(return_address < compiled->size());
-               int index = info->return_address_index(return_address);
-               if(index != -1)
+               cell index = info->return_address_index(return_address);
+               if(index != (cell)-1)
                        ctx->scrub_stacks(info,index);
        }
 };
index eee7b1a8e8b427fa69602cd8e847469fb737b831..d6bb79f4bda8135b9ffff03c9895b852a25a4d14 100644 (file)
@@ -1,7 +1,7 @@
 namespace factor
 {
 
-const u32 gc_info_missing_value = (u32)-1;
+const cell gc_info_missing_value = (cell)-1;
 
 struct gc_info {
        u32 scrub_d_count;
index 303fc37544512e9f3fa242399d3678fb2d27fad3..b97f988e6590e7079c4171796b151e445f3b7ea3 100755 (executable)
@@ -292,7 +292,7 @@ struct call_frame_slot_visitor {
                gc_info *info = compiled->block_gc_info();
 
                assert(return_address < compiled->size());
-               u32 callsite = info->return_address_index(return_address);
+               cell callsite = info->return_address_index(return_address);
                if(callsite == gc_info_missing_value)
                        return;