summaryrefslogtreecommitdiffhomepage
path: root/src/hash.c
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-11-08 17:23:51 +0900
committerDaniel Bovensiepen <[email protected]>2012-11-08 17:23:51 +0900
commite1e369470eb41453cb79abdbbbdb9158489e2d26 (patch)
tree0e4dce8c16af6f8519869a71c9c44f3ee2f3595b /src/hash.c
parentcdb72a05a294eb8521dd40c011160228496312cb (diff)
parent1c95f4eb82d525d7d5eacd214904d262554bf93d (diff)
downloadmruby-e1e369470eb41453cb79abdbbbdb9158489e2d26.tar.gz
mruby-e1e369470eb41453cb79abdbbbdb9158489e2d26.zip
Merge new change
Diffstat (limited to 'src/hash.c')
-rw-r--r--src/hash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hash.c b/src/hash.c
index 51f85f4e8..229e61db7 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -37,7 +37,7 @@ static void mrb_hash_modify(mrb_state *mrb, mrb_value hash);
static inline mrb_value
mrb_hash_ht_key(mrb_state *mrb, mrb_value key)
{
- if (mrb_type(key) == MRB_TT_STRING)
+ if (mrb_string_p(key))
return mrb_str_dup(mrb, key);
else
return key;
@@ -1106,7 +1106,7 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql)
khash_t(ht) *h1, *h2;
if (mrb_obj_equal(mrb, hash1, hash2)) return mrb_true_value();
- if (mrb_type(hash2) != MRB_TT_HASH) {
+ if (!mrb_hash_p(hash2)) {
if (!mrb_respond_to(mrb, hash2, mrb_intern(mrb, "to_hash"))) {
return mrb_false_value();
}