ngoto	2015-12-05 00:59:10 +0900 (Sat, 05 Dec 2015)

  New Revision: 52886

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

  Log:
    * include/ruby/ruby.h (RB_OBJ_TAINT): follow-up of r52881.
      Turn into void expression not to use unexpected result.
      Fix "operands have incompatible types" error with
      Oracle Solaris Studio 12.x on Solaris.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/ruby.h
Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 52885)
+++ include/ruby/ruby.h	(revision 52886)
@@ -1304,7 +1304,7 @@ struct RStruct { https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L1304
 #define RB_OBJ_TAINTED_RAW(x) RB_FL_TEST_RAW(x, RUBY_FL_TAINT)
 #define RB_OBJ_TAINTED(x) (!!RB_FL_TEST((x), RUBY_FL_TAINT))
 #define RB_OBJ_TAINT_RAW(x) RB_FL_SET_RAW(x, RUBY_FL_TAINT)
-#define RB_OBJ_TAINT(x) (RB_OBJ_TAINTABLE(x) ? RB_OBJ_TAINT_RAW(x) : 0)
+#define RB_OBJ_TAINT(x) (RB_OBJ_TAINTABLE(x) ? RB_OBJ_TAINT_RAW(x) : (void)0)
 #define RB_OBJ_UNTRUSTED(x) RB_OBJ_TAINTED(x)
 #define RB_OBJ_UNTRUST(x) RB_OBJ_TAINT(x)
 #define RB_OBJ_INFECT_RAW(x,s) RB_FL_SET_RAW(x, RB_OBJ_TAINTED_RAW(s))
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52885)
+++ ChangeLog	(revision 52886)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Dec  5 00:56:29 2015  Naohisa Goto  <ngotogenome@g...>
+
+	* include/ruby/ruby.h (RB_OBJ_TAINT): follow-up of r52881.
+	  Turn into void expression not to use unexpected result.
+	  Fix "operands have incompatible types" error with
+	  Oracle Solaris Studio 12.x on Solaris.
+
 Fri Dec  4 19:52:52 2015  Martin Duerst  <duerst@i...>
 
 	* enc/iso_8859_13.c: Added three missing lower/upper-case

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