nagachika	2017-05-10 00:24:13 +0900 (Wed, 10 May 2017)

  New Revision: 58635

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58635

  Log:
    merge revision(s) 58211: [Backport #13387]
    
    string.c: Supress logical-op-parentheses warning
    
    * string.c(rb_str_upcase_bang): Supress logical-op-parentheses warning
      Patch by Fukuo Kadota <fukuo-kadota@c...>,
      Closes [GH-1570] [Bug #13387].

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/string.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/string.c
===================================================================
--- ruby_2_4/string.c	(revision 58634)
+++ ruby_2_4/string.c	(revision 58635)
@@ -6102,7 +6102,7 @@ rb_str_upcase_bang(int argc, VALUE *argv https://github.com/ruby/ruby/blob/trunk/ruby_2_4/string.c#L6102
     str_modify_keep_cr(str);
     enc = STR_ENC_GET(str);
     rb_str_check_dummy_enc(enc);
-    if ((flags&ONIGENC_CASE_ASCII_ONLY) && (enc==rb_utf8_encoding() || rb_enc_mbmaxlen(enc)==1)
+    if (((flags&ONIGENC_CASE_ASCII_ONLY) && (enc==rb_utf8_encoding() || rb_enc_mbmaxlen(enc)==1))
 	|| (!(flags&ONIGENC_CASE_FOLD_TURKISH_AZERI) && ENC_CODERANGE(str)==ENC_CODERANGE_7BIT)) {
         char *s = RSTRING_PTR(str), *send = RSTRING_END(str);
 
@@ -6168,7 +6168,7 @@ rb_str_downcase_bang(int argc, VALUE *ar https://github.com/ruby/ruby/blob/trunk/ruby_2_4/string.c#L6168
     str_modify_keep_cr(str);
     enc = STR_ENC_GET(str);
     rb_str_check_dummy_enc(enc);
-    if ((flags&ONIGENC_CASE_ASCII_ONLY) && (enc==rb_utf8_encoding() || rb_enc_mbmaxlen(enc)==1)
+    if (((flags&ONIGENC_CASE_ASCII_ONLY) && (enc==rb_utf8_encoding() || rb_enc_mbmaxlen(enc)==1))
 	|| (!(flags&ONIGENC_CASE_FOLD_TURKISH_AZERI) && ENC_CODERANGE(str)==ENC_CODERANGE_7BIT)) {
         char *s = RSTRING_PTR(str), *send = RSTRING_END(str);
 
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 58634)
+++ ruby_2_4/version.h	(revision 58635)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-05-10"
-#define RUBY_PATCHLEVEL 128
+#define RUBY_PATCHLEVEL 129
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 5
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 58634)
+++ ruby_2_4	(revision 58635)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r58211

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/