summaryrefslogtreecommitdiffhomepage
path: root/src/proc.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2012-05-20 10:07:41 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2012-05-20 10:07:41 -0700
commitebfebfc3658660ebdb4a32991d1eab736bfee504 (patch)
tree08448056bc440124baab552e716c383f5e3f5ef7 /src/proc.c
parentec8f97d2a6facab56ff78cc62ebf1928d06bed4a (diff)
parent9e336b00e5934dbe583edfd1db6370fa4e78745d (diff)
downloadmruby-ebfebfc3658660ebdb4a32991d1eab736bfee504.tar.gz
mruby-ebfebfc3658660ebdb4a32991d1eab736bfee504.zip
Merge pull request #171 from mitchblank/cplusplus
More C++ compilability work: mrb_obj_alloc void* conversions
Diffstat (limited to 'src/proc.c')
-rw-r--r--src/proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/proc.c b/src/proc.c
index c579d8d17..ab77e43fa 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -15,7 +15,7 @@ mrb_proc_new(mrb_state *mrb, mrb_irep *irep)
{
struct RProc *p;
- p = mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
+ p = (struct RProc *) mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
p->body.irep = irep;
p->target_class = (mrb->ci) ? mrb->ci->target_class : 0;
p->env = 0;
@@ -30,7 +30,7 @@ mrb_closure_new(mrb_state *mrb, mrb_irep *irep)
struct REnv *e;
if (!mrb->ci->env) {
- e = mrb_obj_alloc(mrb, MRB_TT_ENV, (struct RClass *) mrb->ci->proc->env);
+ e = (struct REnv *) mrb_obj_alloc(mrb, MRB_TT_ENV, (struct RClass *) mrb->ci->proc->env);
e->flags= (unsigned int)mrb->ci->proc->body.irep->nlocals;
e->mid = mrb->ci->mid;
e->cioff = mrb->ci - mrb->cibase;
@@ -49,7 +49,7 @@ mrb_proc_new_cfunc(mrb_state *mrb, mrb_func_t func)
{
struct RProc *p;
- p = mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
+ p = (struct RProc *) mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
p->body.func = func;
p->flags |= MRB_PROC_CFUNC;