summaryrefslogtreecommitdiffhomepage
path: root/src/re.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/re.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/re.c')
-rw-r--r--src/re.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/re.c b/src/re.c
index 9c7af3220..aaaba6734 100644
--- a/src/re.c
+++ b/src/re.c
@@ -88,7 +88,7 @@ mrb_reg_s_new_instance(mrb_state *mrb, /*int argc, mrb_value *argv, */mrb_value
struct RRegexp *re;
mrb_get_args(mrb, "*", &argv, &argc);
- re = mrb_obj_alloc(mrb, MRB_TT_REGEX, REGEX_CLASS);
+ re = (struct RRegexp *) mrb_obj_alloc(mrb, MRB_TT_REGEX, REGEX_CLASS);
re->ptr = 0;
re->src = 0;
re->usecnt = 0;
@@ -1665,7 +1665,7 @@ match_alloc(mrb_state *mrb)
{
struct RMatch* m;
- m = mrb_obj_alloc(mrb, MRB_TT_MATCH, MATCH_CLASS);
+ m = (struct RMatch *) mrb_obj_alloc(mrb, MRB_TT_MATCH, MATCH_CLASS);
m->str = 0;
m->rmatch = 0;
@@ -2453,7 +2453,7 @@ mrb_reg_s_alloc(mrb_state *mrb, mrb_value dummy)
//NEWOBJ(re, struct RRegexp);
//OBJSETUP(re, klass, T_REGEXP);
- re = mrb_obj_alloc(mrb, MRB_TT_REGEX, REGEX_CLASS);
+ re = (struct RRegexp *) mrb_obj_alloc(mrb, MRB_TT_REGEX, REGEX_CLASS);
re->ptr = 0;
re->src = 0;