From 65a564376e9e3a1a28120de1bb1b2ce89266e17b Mon Sep 17 00:00:00 2001 From: tmm1 Date: Sat, 23 Nov 2013 00:46:25 +0000 Subject: * marshal.c (w_object): Use HASH_PROC_DEFAULT directly from internal.h git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ marshal.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07731a2ecb..050311c768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Nov 23 09:45:49 2013 Aman Gupta + + * marshal.c (w_object): Use HASH_PROC_DEFAULT directly from internal.h + Sat Nov 23 08:43:23 2013 Aman Gupta * gc.c: Rename heap_pages_swept_num to heap_pages_swept_slots to diff --git a/marshal.c b/marshal.c index c1b6a79752..80f8ba7cae 100644 --- a/marshal.c +++ b/marshal.c @@ -797,8 +797,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit) if (NIL_P(RHASH_IFNONE(obj))) { w_byte(TYPE_HASH, arg); } - else if (FL_TEST(obj, FL_USER2)) { - /* FL_USER2 means HASH_PROC_DEFAULT (see hash.c) */ + else if (FL_TEST(obj, HASH_PROC_DEFAULT)) { rb_raise(rb_eTypeError, "can't dump hash with default proc"); } else { -- cgit v1.2.3