[前][次][番号順一覧][スレッド一覧]

ruby-changes:10070

From: shyouhei <ko1@a...>
Date: Sat, 17 Jan 2009 12:12:03 +0900 (JST)
Subject: [ruby-changes:10070] Ruby:r21613 (ruby_1_8_6): merge revision(s) 16602:

shyouhei	2009-01-17 12:11:47 +0900 (Sat, 17 Jan 2009)

  New Revision: 21613

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

  Log:
    merge revision(s) 16602:
    * marshal.c (dump_ensure, load_ensure): should return values.

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/marshal.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21612)
+++ ruby_1_8_6/ChangeLog	(revision 21613)
@@ -1,3 +1,7 @@
+Sat Jan 17 12:11:06 2009  NAKAMURA Usaku  <usa@r...>
+
+	* marshal.c (dump_ensure, load_ensure): should return values.
+
 Fri Jan 16 10:55:51 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* class.c (clone_method): should copy cbase in cref as well.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21612)
+++ ruby_1_8_6/version.h	(revision 21613)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-16"
+#define RUBY_RELEASE_DATE "2009-01-17"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090116
-#define RUBY_PATCHLEVEL 300
+#define RUBY_RELEASE_CODE 20090117
+#define RUBY_PATCHLEVEL 301
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/marshal.c
===================================================================
--- ruby_1_8_6/marshal.c	(revision 21612)
+++ ruby_1_8_6/marshal.c	(revision 21613)
@@ -703,7 +703,7 @@
 dump_ensure(arg)
     struct dump_arg *arg;
 {
-    if (RBASIC(arg->str)->klass) return; /* ignore reentrant */
+    if (RBASIC(arg->str)->klass) return 0; /* ignore reentrant */
     st_free_table(arg->symbols);
     st_free_table(arg->data);
     if (arg->taint) {
@@ -1391,7 +1391,7 @@
 load_ensure(arg)
     struct load_arg *arg;
 {
-    if (RBASIC(arg->data)->klass) return; /* ignore reentrant */
+    if (RBASIC(arg->data)->klass) return 0; /* ignore reentrant */
     st_free_table(arg->symbols);
     return 0;
 }

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

[前][次][番号順一覧][スレッド一覧]