diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | method.h | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Nov 8 14:24:43 2015 windwiny <windwiny.ubt@gmail.com> + + * method.h (METHOD_ENTRY_{VISI,BASIC,FLAGS}_SET): suppress + shift-op-parentheses warnings. [Fix GH-1082] + Sun Nov 8 14:01:22 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * ext/psych/psych_emitter.c: bakcport 5bd7744 from tenderlove/psych. @@ -70,13 +70,13 @@ static inline void METHOD_ENTRY_VISI_SET(rb_method_entry_t *me, rb_method_visibility_t visi) { VM_ASSERT((int)visi >= 0 && visi <= 3); - me->flags = (me->flags & ~(IMEMO_FL_USER0 | IMEMO_FL_USER1)) | (visi << IMEMO_FL_USHIFT+0); + me->flags = (me->flags & ~(IMEMO_FL_USER0 | IMEMO_FL_USER1)) | (visi << (IMEMO_FL_USHIFT+0)); } static inline void METHOD_ENTRY_BASIC_SET(rb_method_entry_t *me, unsigned int basic) { VM_ASSERT(basic <= 1); - me->flags = (me->flags & ~(IMEMO_FL_USER2 )) | (basic << IMEMO_FL_USHIFT+2); + me->flags = (me->flags & ~(IMEMO_FL_USER2 )) | (basic << (IMEMO_FL_USHIFT+2)); } static inline void METHOD_ENTRY_FLAGS_SET(rb_method_entry_t *me, rb_method_visibility_t visi, unsigned int basic) @@ -85,7 +85,7 @@ METHOD_ENTRY_FLAGS_SET(rb_method_entry_t *me, rb_method_visibility_t visi, unsig VM_ASSERT(basic <= 1); me->flags = (me->flags & ~(IMEMO_FL_USER0|IMEMO_FL_USER1|IMEMO_FL_USER2)) | - ((visi << IMEMO_FL_USHIFT+0) | (basic << (IMEMO_FL_USHIFT+2))); + ((visi << (IMEMO_FL_USHIFT+0)) | (basic << (IMEMO_FL_USHIFT+2))); } static inline void METHOD_ENTRY_FLAGS_COPY(rb_method_entry_t *dst, const rb_method_entry_t *src) |