diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-20 07:29:55 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-20 07:29:55 +0900 |
| commit | d73dfa87087879ca3b06e1f30a68a120549e0a57 (patch) | |
| tree | a4bc7d8fe8f495fdf5784c7e6477c8abe3856cd9 /src/state.c | |
| parent | 6742421907765ecd4bfb80f74a080e91bf5b0d52 (diff) | |
| parent | 54c5b12fb7bc5fdd57326780e970ee467387f81a (diff) | |
| download | mruby-d73dfa87087879ca3b06e1f30a68a120549e0a57.tar.gz mruby-d73dfa87087879ca3b06e1f30a68a120549e0a57.zip | |
resolve conflict
Diffstat (limited to 'src/state.c')
| -rw-r--r-- | src/state.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/state.c b/src/state.c index 9ec96068e..c8f3c48f8 100644 --- a/src/state.c +++ b/src/state.c @@ -11,6 +11,7 @@ #include "mruby/irep.h" #include "mruby/variable.h" #include "mruby/debug.h" +#include "mruby/string.h" void mrb_init_heap(mrb_state*); void mrb_init_core(mrb_state*); @@ -129,8 +130,8 @@ mrb_irep_free(mrb_state *mrb, mrb_irep *irep) if (!(irep->flags & MRB_ISEQ_NO_FREE)) mrb_free(mrb, irep->iseq); for (i=0; i<irep->plen; i++) { - if (irep->pool[i].type == IREP_TT_STRING) - mrb_free(mrb, irep->pool[i].value.s); + if (mrb_type(irep->pool[i]) == MRB_TT_STRING) + mrb_free(mrb, mrb_obj_ptr(irep->pool[i])); } mrb_free(mrb, irep->pool); mrb_free(mrb, irep->syms); |