From 0d16b614bfef56f513a51caf604f6f5e13418ae5 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 Mar 2007 11:38:42 +0000
Subject: 	* marshal.c (w_short, w_long, w_object): get rid of VC++
 warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  4 ++++
 marshal.c | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3adc39ab8a..3a648e39d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 21 20:38:06 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* marshal.c (w_short, w_long, w_object): get rid of VC++ warnings.
+
 Wed Mar 21 20:05:07 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
diff --git a/marshal.c b/marshal.c
index 4cf4a9a049..96ed62723f 100644
--- a/marshal.c
+++ b/marshal.c
@@ -143,8 +143,8 @@ w_bytes(const char *s, int n, struct dump_arg *arg)
 static void
 w_short(int x, struct dump_arg *arg)
 {
-    w_byte((x >> 0) & 0xff, arg);
-    w_byte((x >> 8) & 0xff, arg);
+    w_byte((char)((x >> 0) & 0xff), arg);
+    w_byte((char)((x >> 8) & 0xff), arg);
 }
 
 static void
@@ -165,11 +165,11 @@ w_long(long x, struct dump_arg *arg)
 	return;
     }
     if (0 < x && x < 123) {
-	w_byte(x + 5, arg);
+	w_byte((char)(x + 5), arg);
 	return;
     }
     if (-124 < x && x < 0) {
-	w_byte((x - 5)&0xff, arg);
+	w_byte((char)((x - 5)&0xff), arg);
 	return;
     }
     for (i=1;i<sizeof(long)+1;i++) {
@@ -548,7 +548,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 	    w_uclass(obj, rb_cRegexp, arg);
 	    w_byte(TYPE_REGEXP, arg);
 	    w_bytes(RREGEXP(obj)->str, RREGEXP(obj)->len, arg);
-	    w_byte(rb_reg_options(obj), arg);
+	    w_byte((char)rb_reg_options(obj), arg);
 	    break;
 
 	  case T_ARRAY:
-- 
cgit v1.2.3