diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-12 09:16:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-12 09:16:15 +0000 |
| commit | d1abc53721a15bd545b60c875b05f28dd7e01e57 (patch) | |
| tree | 44da5708baceb68988497901e3915fbcece7c02d /variable.c | |
| parent | 080525aa68c68df1fd4c1484bea1de88e3c1f79f (diff) | |
* array.c, bignum.c, dln.c, error.c, gc.c, io.c, marshal.c,
numeric.c, pack.c, strftime.c, string.c, thread.c, transcode.c,
transcode_data.h, util.c, variable.c, vm_dump.c,
include/ruby/encoding.h, missing/crypt.c, missing/vsnprintf.c:
suppress VC type warnings. [ruby-core:22726]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/variable.c b/variable.c index d97895471e..7743b6778f 100644 --- a/variable.c +++ b/variable.c @@ -963,7 +963,7 @@ ivar_get(VALUE obj, ID id, int warn) iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); if (!iv_index_tbl) break; if (!st_lookup(iv_index_tbl, id, &index)) break; - if (len <= index) break; + if (len <= (long)index) break; val = ptr[index]; if (val != Qundef) return val; @@ -1024,7 +1024,7 @@ rb_ivar_set(VALUE obj, ID id, VALUE val) ivar_extended = 1; } len = ROBJECT_NUMIV(obj); - if (len <= index) { + if (len <= (long)index) { VALUE *ptr = ROBJECT_IVPTR(obj); if (index < ROBJECT_EMBED_LEN_MAX) { RBASIC(obj)->flags |= ROBJECT_EMBED; @@ -1037,7 +1037,7 @@ rb_ivar_set(VALUE obj, ID id, VALUE val) VALUE *newptr; long newsize = (index+1) + (index+1)/4; /* (index+1)*1.25 */ if (!ivar_extended && - iv_index_tbl->num_entries < newsize) { + iv_index_tbl->num_entries < (st_index_t)newsize) { newsize = iv_index_tbl->num_entries; } if (RBASIC(obj)->flags & ROBJECT_EMBED) { @@ -1081,7 +1081,7 @@ rb_ivar_defined(VALUE obj, ID id) iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); if (!iv_index_tbl) break; if (!st_lookup(iv_index_tbl, id, &index)) break; - if (ROBJECT_NUMIV(obj) <= index) break; + if (ROBJECT_NUMIV(obj) <= (long)index) break; val = ROBJECT_IVPTR(obj)[index]; if (val != Qundef) return Qtrue; @@ -1108,7 +1108,7 @@ struct obj_ivar_tag { static int obj_ivar_i(ID key, VALUE index, struct obj_ivar_tag *data) { - if (index < ROBJECT_NUMIV(data->obj)) { + if ((long)index < ROBJECT_NUMIV(data->obj)) { VALUE val = ROBJECT_IVPTR(data->obj)[index]; if (val != Qundef) { return (data->func)(key, val, data->arg); @@ -1238,7 +1238,7 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name) iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); if (!iv_index_tbl) break; if (!st_lookup(iv_index_tbl, id, &index)) break; - if (ROBJECT_NUMIV(obj) <= index) break; + if (ROBJECT_NUMIV(obj) <= (long)index) break; val = ROBJECT_IVPTR(obj)[index]; if (val != Qundef) { ROBJECT_IVPTR(obj)[index] = Qundef; |