提交 18978d77 编写于 作者: M Matt Witherspoon

Fixed gcc and some clang build problems

上级 b0e2e5e3
......@@ -26,7 +26,7 @@ class wavm_runtime : public eosio::chain::wasm_runtime_interface {
//This is a temporary hack for the single threaded implementation
struct running_instance_context {
MemoryInstance* memory;
apply_context* apply_context;
apply_context* apply_ctx;
};
extern running_instance_context the_running_instance_context;
......@@ -598,7 +598,7 @@ struct intrinsic_function_invoker {
template<MethodSig Method>
static Ret wrapper(running_instance_context& ctx, Params... params) {
return (class_from_wasm<Cls>::value(*ctx.apply_context).*Method)(params...);
return (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
}
template<MethodSig Method>
......@@ -616,7 +616,7 @@ struct intrinsic_function_invoker<WasmSig, void, MethodSig, Cls, Params...> {
template<MethodSig Method>
static void_type wrapper(running_instance_context& ctx, Params... params) {
(class_from_wasm<Cls>::value(*ctx.apply_context).*Method)(params...);
(class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
return void_type();
}
......
......@@ -62,7 +62,7 @@ class wavm_instantiated_module : public wasm_instantiated_module_interface {
}
the_running_instance_context.memory = default_mem;
the_running_instance_context.apply_context = &context;
the_running_instance_context.apply_ctx = &context;
resetGlobalInstances(_instance);
runInstanceStartFunc(_instance);
......
......@@ -268,7 +268,7 @@ BOOST_FIXTURE_TEST_CASE( check_global_reset, tester ) try {
{
action act;
act.account = N(globalreset);
act.name = 0ULL;
act.name = name(0ULL);
act.authorization = vector<permission_level>{{N(globalreset),config::active_name}};
trx.actions.push_back(act);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册