diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-20 10:07:41 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-20 10:07:41 -0700 |
| commit | ebfebfc3658660ebdb4a32991d1eab736bfee504 (patch) | |
| tree | 08448056bc440124baab552e716c383f5e3f5ef7 /src/gc.c | |
| parent | ec8f97d2a6facab56ff78cc62ebf1928d06bed4a (diff) | |
| parent | 9e336b00e5934dbe583edfd1db6370fa4e78745d (diff) | |
| download | mruby-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/gc.c')
| -rw-r--r-- | src/gc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -242,7 +242,7 @@ mrb_init_heap(mrb_state *mrb) #endif } -void* +struct RBasic* mrb_obj_alloc(mrb_state *mrb, enum mrb_vtype ttype, struct RClass *cls) { struct RBasic *p; @@ -270,7 +270,7 @@ mrb_obj_alloc(mrb_state *mrb, enum mrb_vtype ttype, struct RClass *cls) p->tt = ttype; p->c = cls; paint_partial_white(mrb, p); - return (void*)p; + return p; } static inline void |