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/string.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/string.c')
| -rw-r--r-- | src/string.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/string.c b/src/string.c index 01d706fa3..1b57efc71 100644 --- a/src/string.c +++ b/src/string.c @@ -488,7 +488,7 @@ check_frozen(mrb_state *mrb, struct RString *s) static mrb_value str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2) { - long len; + mrb_int len; check_frozen(mrb, s1); if (s1 == s2) return mrb_obj_value(s1); @@ -1125,7 +1125,7 @@ static mrb_value mrb_str_aref_m(mrb_state *mrb, mrb_value str) { mrb_value a1, a2; - int argc; + mrb_int argc; argc = mrb_get_args(mrb, "o|o", &a1, &a2); if (argc == 2) { @@ -1467,7 +1467,7 @@ mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len) return str_substr(mrb, str, beg, len); } -mrb_int +uint32_t mrb_str_hash(mrb_state *mrb, mrb_value str) { /* 1-8-7 */ @@ -1480,7 +1480,7 @@ mrb_str_hash(mrb_state *mrb, mrb_value str) key = key*65599 + *p; p++; } - return (mrb_int)(key + (key>>5)); + return (uint32_t)(key + (key>>5)); } /* 15.2.10.5.20 */ @@ -1911,7 +1911,7 @@ mrb_str_rindex(mrb_state *mrb, mrb_value str) static mrb_value mrb_str_split_m(mrb_state *mrb, mrb_value str) { - int argc; + mrb_int argc; mrb_value spat = mrb_nil_value(); enum {awk, string, regexp} split_type = string; mrb_int i = 0; @@ -2025,7 +2025,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) } MRB_API mrb_value -mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, int base, int badcheck) +mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base, int badcheck) { const char *p = str; const char *pend = str + len; |