Merge new change

1 files changed, 15 insertions, 16 deletions

diff --git a/src/gc.c b/src/gc.c
index 37e4a363b..374072ce5 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -5,7 +5,6 @@
 */
 
 #include "mruby.h"
-#include "mruby/object.h"
 #include "mruby/class.h"
 #include "mruby/array.h"
 #include "mruby/string.h"
@@ -318,8 +317,8 @@ gc_protect(mrb_state *mrb, struct RBasic *p)
 void
 mrb_gc_protect(mrb_state *mrb, mrb_value obj)
 {
-  if (SPECIAL_CONST_P(obj)) return;
-  gc_protect(mrb, RBASIC(obj));
+  if (mrb_special_const_p(obj)) return;
+  gc_protect(mrb, mrb_basic(obj));
 }
 
 struct RBasic*
@@ -1076,8 +1075,8 @@ test_mrb_field_write_barrier(void)
   struct RBasic *obj, *value;
 
   puts("test_mrb_field_write_barrier");
-  obj = RBASIC(mrb_ary_new(mrb));
-  value = RBASIC(mrb_str_new_cstr(mrb, "value"));
+  obj = mrb_basic(mrb_ary_new(mrb));
+  value = mrb_basic(mrb_str_new_cstr(mrb, "value"));
   paint_black(obj);
   paint_partial_white(mrb,value);
 
@@ -1118,15 +1117,15 @@ test_mrb_field_write_barrier(void)
 
   {
     puts("test_mrb_field_write_barrier_value");
-    obj = RBASIC(mrb_ary_new(mrb));
+    obj = mrb_basic(mrb_ary_new(mrb));
     mrb_value value = mrb_str_new_cstr(mrb, "value");
     paint_black(obj);
-    paint_partial_white(mrb, RBASIC(value));
+    paint_partial_white(mrb, mrb_basic(value));
 
     mrb->gc_state = GC_STATE_MARK;
     mrb_field_write_barrier_value(mrb, obj, value);
 
-    gc_assert(is_gray(RBASIC(value)));
+    gc_assert(is_gray(mrb_basic(value)));
   }
 
   mrb_close(mrb);
@@ -1139,7 +1138,7 @@ test_mrb_write_barrier(void)
   struct RBasic *obj;
 
   puts("test_mrb_write_barrier");
-  obj = RBASIC(mrb_ary_new(mrb));
+  obj = mrb_basic(mrb_ary_new(mrb));
   paint_black(obj);
 
   puts("  in GC_STATE_MARK");
@@ -1167,12 +1166,12 @@ test_add_gray_list(void)
 
   puts("test_add_gray_list");
   gc_assert(mrb->gray_list == NULL);
-  obj1 = RBASIC(mrb_str_new_cstr(mrb, "test"));
+  obj1 = mrb_basic(mrb_str_new_cstr(mrb, "test"));
   add_gray_list(mrb, obj1);
   gc_assert(mrb->gray_list == obj1);
   gc_assert(is_gray(obj1));
 
-  obj2 = RBASIC(mrb_str_new_cstr(mrb, "test"));
+  obj2 = mrb_basic(mrb_str_new_cstr(mrb, "test"));
   add_gray_list(mrb, obj2);
   gc_assert(mrb->gray_list == obj2);
   gc_assert(mrb->gray_list->gcnext == obj1);
@@ -1201,12 +1200,12 @@ test_gc_gray_mark(void)
   puts("  in MRB_TT_ARRAY");
   obj_v = mrb_ary_new(mrb);
   value_v = mrb_str_new_cstr(mrb, "test");
-  paint_gray(RBASIC(obj_v));
-  paint_partial_white(mrb, RBASIC(value_v));
+  paint_gray(mrb_basic(obj_v));
+  paint_partial_white(mrb, mrb_basic(value_v));
   mrb_ary_push(mrb, obj_v, value_v);
-  gray_num = gc_gray_mark(mrb, RBASIC(obj_v));
-  gc_assert(is_black(RBASIC(obj_v)));
-  gc_assert(is_gray(RBASIC(value_v)));
+  gray_num = gc_gray_mark(mrb, mrb_basic(obj_v));
+  gc_assert(is_black(mrb_basic(obj_v)));
+  gc_assert(is_gray(mrb_basic(value_v)));
   gc_assert(gray_num == 1);
 
   mrb_close(mrb);