aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-14 09:51:50 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-14 09:51:50 +0000
commite04c402dfa402e91681b503772bae69b5a302d8e (patch)
tree18e0cbb91c6739ce586c91a17a6c350ab2b82330
parent4a58fdde16fbc110b983a20630885fa7a05f7457 (diff)
downloadruby-e04c402dfa402e91681b503772bae69b5a302d8e.tar.gz
method.h: cast checks to int for >= 0 checks
Setting VM_CHECK_MODE to 1 in vm_core.h makes noisy warnings otherwise. AFAIK, the signedness of enums is implementation-dependent, and GCC considers them unsigned and warns. Tested on gcc 4.7.2 (Debian 4.7.2-5) * method.h (METHOD_ENTRY_VISI_SET): cast visi to int (METHOD_ENTRY_FLAGS_SET): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--method.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f0f3f9e132..a258582d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 14 18:50:57 2015 Eric Wong <e@80x24.org>
+
+ * method.h (METHOD_ENTRY_VISI_SET): cast visi to int
+ (METHOD_ENTRY_FLAGS_SET): ditto
+
Fri Aug 14 18:43:11 2015 Eric Wong <e@80x24.org>
* process.c (close_unless_reserved): add extra check
diff --git a/method.h b/method.h
index e46ba551a2..71dc2c088b 100644
--- a/method.h
+++ b/method.h
@@ -68,7 +68,7 @@ typedef struct rb_callable_method_entry_struct { /* same fields with rb_method_e
static inline void
METHOD_ENTRY_VISI_SET(rb_method_entry_t *me, rb_method_visibility_t visi)
{
- VM_ASSERT(visi >= 0 && visi <= 3);
+ VM_ASSERT((int)visi >= 0 && visi <= 3);
me->flags = (me->flags & ~(IMEMO_FL_USER0 | IMEMO_FL_USER1)) | (visi << IMEMO_FL_USHIFT+0);
}
static inline void
@@ -86,7 +86,7 @@ METHOD_ENTRY_SAFE_SET(rb_method_entry_t *me, unsigned int safe)
static inline void
METHOD_ENTRY_FLAGS_SET(rb_method_entry_t *me, rb_method_visibility_t visi, unsigned int basic, unsigned int safe)
{
- VM_ASSERT(visi >= 0 && visi <= 3);
+ VM_ASSERT((int)visi >= 0 && visi <= 3);
VM_ASSERT(basic <= 1);
VM_ASSERT(safe <= 1);
me->flags =