summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-03-01 10:26:21 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-03-01 10:26:21 +0900
commit5fb8fa5a81566356b6bf9c4410853b77f9d02570 (patch)
tree88e75de2567ee7a16f2e20275aed9b23a11791b0 /src
parentfca90a43c7a5c3a8e38b276bc1e139d0fb08f5e9 (diff)
downloadmruby-5fb8fa5a81566356b6bf9c4410853b77f9d02570.tar.gz
mruby-5fb8fa5a81566356b6bf9c4410853b77f9d02570.zip
add _FLAG to SET_SHARED macros; ref #1750
Diffstat (limited to 'src')
-rw-r--r--src/array.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/array.c b/src/array.c
index ce43a0392..90a608b70 100644
--- a/src/array.c
+++ b/src/array.c
@@ -16,8 +16,8 @@
#define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value))
#define ARY_MAX_SIZE ((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? (mrb_int)ARY_C_MAX_SIZE : MRB_INT_MAX-1)
#define ARY_SHARED_P(a) ((a)->flags & MRB_ARY_SHARED)
-#define ARY_SET_SHARED(a) ((a)->flags |= MRB_ARY_SHARED)
-#define ARY_UNSET_SHARED(a) ((a)->flags &= ~MRB_ARY_SHARED)
+#define ARY_SET_SHARED_FLAG(a) ((a)->flags |= MRB_ARY_SHARED)
+#define ARY_UNSET_SHARED_FLAG(a) ((a)->flags &= ~MRB_ARY_SHARED)
static inline mrb_value
ary_elt(mrb_value ary, mrb_int offset)
@@ -149,7 +149,7 @@ ary_modify(mrb_state *mrb, struct RArray *a)
a->aux.capa = a->len;
mrb_ary_decref(mrb, shared);
}
- ARY_UNSET_SHARED(a);
+ ARY_UNSET_SHARED_FLAG(a);
}
}
@@ -175,7 +175,7 @@ ary_make_shared(mrb_state *mrb, struct RArray *a)
}
shared->len = a->len;
a->aux.shared = shared;
- ARY_SET_SHARED(a);
+ ARY_SET_SHARED_FLAG(a);
}
}
@@ -671,7 +671,7 @@ ary_subseq(mrb_state *mrb, struct RArray *a, mrb_int beg, mrb_int len)
b->len = len;
b->aux.shared = a->aux.shared;
b->aux.shared->refcnt++;
- ARY_SET_SHARED(b);
+ ARY_SET_SHARED_FLAG(b);
return mrb_obj_value(b);
}