From a955a12aa7416355f0ce0e4632d65da75cd49bab Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 16 Oct 2009 12:13:43 -0500 Subject: [PATCH] vm: fix compile errors on some gcc versions --- vm/factor.cpp | 2 +- vm/vm.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vm/factor.cpp b/vm/factor.cpp index d7f8cf0fbe..8b1202ddb0 100755 --- a/vm/factor.cpp +++ b/vm/factor.cpp @@ -76,7 +76,7 @@ void factor_vm::init_parameters_from_args(vm_parameters *p, int argc, vm_char ** for(i = 1; i < argc; i++) { vm_char *arg = argv[i]; - if(STRCMP(arg,"--") == 0) break; + if(STRCMP(arg,STRING_LITERAL("--")) == 0) break; else if(factor_arg(arg,STRING_LITERAL("-datastack=%d"),&p->ds_size)); else if(factor_arg(arg,STRING_LITERAL("-retainstack=%d"),&p->rs_size)); else if(factor_arg(arg,STRING_LITERAL("-young=%d"),&p->young_size)); diff --git a/vm/vm.hpp b/vm/vm.hpp index d21e1e440b..c3d71dc6f2 100755 --- a/vm/vm.hpp +++ b/vm/vm.hpp @@ -110,7 +110,7 @@ struct factor_vm void primitive_set_retainstack(); void primitive_check_datastack(); - template void factor_vm::iterate_active_frames(Iterator &iter) + template void iterate_active_frames(Iterator &iter) { context *ctx = this->ctx; @@ -537,8 +537,8 @@ struct factor_vm } //callbacks - void factor_vm::init_callbacks(cell size); - void factor_vm::primitive_callback(); + void init_callbacks(cell size); + void primitive_callback(); //image void init_objects(image_header *h);