From fff5de3bd418ebb58d5a620403f9da488c7e7148 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 27 Jun 2010 15:13:25 +0000 Subject: * marshal.c (w_object, r_bytes0, marshal_load): suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- marshal.c | 8 ++++---- version.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/marshal.c b/marshal.c index 728e6b2e11..24807fd529 100644 --- a/marshal.c +++ b/marshal.c @@ -637,7 +637,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit) 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 @@ r_bytes0(long len, struct load_arg *arg) 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 @@ marshal_load(int argc, VALUE *argv) 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"); diff --git a/version.h b/version.h index e78356aad4..080509cc7e 100644 --- a/version.h +++ b/version.h @@ -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" -- cgit v1.2.3