From d9803d9e8cad8a9c762f51a98a0582b09bd9d95a Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 1 Mar 2014 09:02:36 +0000 Subject: [PATCH] merge revision(s) 44370: [Backport #9576] hash.c: extra states * hash.c (rb_hash_reject): use words "extra states". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Conflicts: hash.c version.h Conflicts: hash.c --- hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash.c b/hash.c index c5374cb1193a32..644690dfbb309d 100644 --- a/hash.c +++ b/hash.c @@ -1167,7 +1167,7 @@ rb_hash_reject(VALUE hash) #endif } } -#if HASH_REJECT_COPY_MISC_ATTRIBUTES +#if HASH_REJECT_COPY_EXTRA_STATES result = rb_hash_dup_empty(hash); #else result = rb_hash_new();