nobu	2010-06-28 00:13:25 +0900 (Mon, 28 Jun 2010)

  New Revision: 28452

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

  Log:
    * marshal.c (w_object, r_bytes0, marshal_load): suppress warnings.

  Modified files:
    branches/ruby_1_9_2/marshal.c
    branches/ruby_1_9_2/version.h
    trunk/marshal.c
    trunk/version.h

Index: version.h
===================================================================
--- version.h	(revision 28451)
+++ version.h	(revision 28452)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2010-06-27"
+#define RUBY_RELEASE_DATE "2010-06-28"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 
Index: marshal.c
===================================================================
--- marshal.c	(revision 28451)
+++ marshal.c	(revision 28452)
@@ -637,7 +637,7 @@
 	w_symbol(SYM2ID(obj), arg);
     }
     else {
-	arg->infection |= FL_TEST(obj, MARSHAL_INFECTION);
+	arg->infection |= (int)FL_TEST(obj, MARSHAL_INFECTION);
 
 	if (rb_respond_to(obj, s_mdump)) {
 	    volatile VALUE v;
@@ -1110,7 +1110,7 @@
 	if (NIL_P(str)) goto too_short;
 	StringValue(str);
 	if (RSTRING_LEN(str) != len) goto too_short;
-	arg->infection |= FL_TEST(str, MARSHAL_INFECTION);
+	arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION);
     }
     return str;
 }
@@ -1759,14 +1759,14 @@
     rb_scan_args(argc, argv, "11", &port, &proc);
     v = rb_check_string_type(port);
     if (!NIL_P(v)) {
-	infection = FL_TEST(port, MARSHAL_INFECTION); /* original taintedness */
+	infection = (int)FL_TEST(port, MARSHAL_INFECTION); /* original taintedness */
 	port = v;
     }
     else if (rb_respond_to(port, s_getbyte) && rb_respond_to(port, s_read)) {
 	if (rb_respond_to(port, s_binmode)) {
 	    rb_funcall2(port, s_binmode, 0, 0);
 	}
-	infection = FL_TAINT | FL_TEST(port, FL_UNTRUSTED);
+	infection = (int)(FL_TAINT | FL_TEST(port, FL_UNTRUSTED));
     }
     else {
 	rb_raise(rb_eTypeError, "instance of IO needed");
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 28451)
+++ ruby_1_9_2/version.h	(revision 28452)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2010-06-27"
+#define RUBY_RELEASE_DATE "2010-06-28"
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -7,7 +7,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 
Index: ruby_1_9_2/marshal.c
===================================================================
--- ruby_1_9_2/marshal.c	(revision 28451)
+++ ruby_1_9_2/marshal.c	(revision 28452)
@@ -640,7 +640,7 @@
 	w_symbol(SYM2ID(obj), arg);
     }
     else {
-	arg->infection |= FL_TEST(obj, MARSHAL_INFECTION);
+	arg->infection |= (int)FL_TEST(obj, MARSHAL_INFECTION);
 
 	if (rb_respond_to(obj, s_mdump)) {
 	    volatile VALUE v;
@@ -1113,7 +1113,7 @@
 	if (NIL_P(str)) goto too_short;
 	StringValue(str);
 	if (RSTRING_LEN(str) != len) goto too_short;
-	arg->infection |= FL_TEST(str, MARSHAL_INFECTION);
+	arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION);
     }
     return str;
 }
@@ -1762,14 +1762,14 @@
     rb_scan_args(argc, argv, "11", &port, &proc);
     v = rb_check_string_type(port);
     if (!NIL_P(v)) {
-	infection = FL_TEST(port, MARSHAL_INFECTION); /* original taintedness */
+	infection = (int)FL_TEST(port, MARSHAL_INFECTION); /* original taintedness */
 	port = v;
     }
     else if (rb_respond_to(port, s_getbyte) && rb_respond_to(port, s_read)) {
 	if (rb_respond_to(port, s_binmode)) {
 	    rb_funcall2(port, s_binmode, 0, 0);
 	}
-	infection = FL_TAINT | FL_TEST(port, FL_UNTRUSTED);
+	infection = (int)(FL_TAINT | FL_TEST(port, FL_UNTRUSTED));
     }
     else {
 	rb_raise(rb_eTypeError, "instance of IO needed");

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