diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-09-29 00:18:39 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-29 00:18:39 +0900 |
| commit | 29a9e698e33f89c18cd8f9622bd503aa55df2f51 (patch) | |
| tree | e83110a7db0edaa3a6c191abe850ed7b657f766e /src/hash.c | |
| parent | 381850280c036116adaffe42cc420da9c71d28a2 (diff) | |
| parent | 999ce87129fb9216ae746140aa716a764a79b354 (diff) | |
| download | mruby-29a9e698e33f89c18cd8f9622bd503aa55df2f51.tar.gz mruby-29a9e698e33f89c18cd8f9622bd503aa55df2f51.zip | |
Merge pull request #3815 from dabroz/fix-warnings
Fix MSVC 14.0 warnings
Diffstat (limited to 'src/hash.c')
| -rw-r--r-- | src/hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hash.c b/src/hash.c index 93d550187..53ef2b818 100644 --- a/src/hash.c +++ b/src/hash.c @@ -37,7 +37,7 @@ mrb_hash_ht_hash_func(mrb_state *mrb, mrb_value key) default: hv = mrb_funcall(mrb, key, "hash", 0); - h = (khint_t)t ^ mrb_fixnum(hv); + h = (khint_t)t ^ (khint_t)mrb_fixnum(hv); break; } return kh_int_hash_func(mrb, h); @@ -136,7 +136,7 @@ mrb_hash_new_capa(mrb_state *mrb, mrb_int capa) h = (struct RHash*)mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class); /* khash needs 1/4 empty space so it is not resized immediately */ - h->ht = kh_init_size(ht, mrb, capa*4/3); + h->ht = kh_init_size(ht, mrb, (khint_t)(capa*4/3)); h->iv = 0; return mrb_obj_value(h); } |