nobu	2009-11-11 09:36:04 +0900 (Wed, 11 Nov 2009)

  New Revision: 25714

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

  Log:
    * marshal.c (w_object, r_object0): use RHASH_IFNONE but not ifnone
      directly.

  Modified files:
    trunk/ChangeLog
    trunk/marshal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25713)
+++ ChangeLog	(revision 25714)
@@ -1,3 +1,8 @@
+Wed Nov 11 09:36:02 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* marshal.c (w_object, r_object0): use RHASH_IFNONE but not ifnone
+	  directly.
+
 Wed Nov 11 08:32:45 2009  Tanaka Akira  <akr@f...>
 
 	* thread.c (blocking_region_begin): define before BLOCKING_REGION.
Index: marshal.c
===================================================================
--- marshal.c	(revision 25713)
+++ marshal.c	(revision 25714)
@@ -778,7 +778,7 @@
 
 	  case T_HASH:
 	    w_uclass(obj, rb_cHash, arg);
-	    if (NIL_P(RHASH(obj)->ifnone)) {
+	    if (NIL_P(RHASH_IFNONE(obj))) {
 		w_byte(TYPE_HASH, arg);
 	    }
 	    else if (FL_TEST(obj, FL_USER2)) {
@@ -790,8 +790,8 @@
 	    }
 	    w_long(RHASH_SIZE(obj), arg);
 	    rb_hash_foreach(obj, hash_each, (st_data_t)&c_arg);
-	    if (!NIL_P(RHASH(obj)->ifnone)) {
-		w_object(RHASH(obj)->ifnone, arg, limit);
+	    if (!NIL_P(RHASH_IFNONE(obj))) {
+		w_object(RHASH_IFNONE(obj), arg, limit);
 	    }
 	    break;
 
@@ -1564,7 +1564,7 @@
 		rb_hash_aset(v, key, value);
 	    }
 	    if (type == TYPE_HASH_DEF) {
-		RHASH(v)->ifnone = r_object(arg);
+		RHASH_IFNONE(v) = r_object(arg);
 	    }
             v = r_leave(v, arg);
 	}

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