summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-03 22:44:45 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-03 22:44:45 +0000
commite00b83ceb91048da8549399c11618345ce32d9cc (patch)
tree68f70f724a49ab45cbfabe08cb0c635393a13948
parentd6b9cc7baaa8d54e996f43f2520698279c6d349f (diff)
* hash.c (rb_hash_replace): should copy compare_by_identity status as well.
[ruby-core:24728] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--hash.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 453902c6bde..e376d31429a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 4 06:30:01 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * hash.c (rb_hash_replace): should copy compare_by_identity status as well.
+ [ruby-core:24728]
+
Tue Aug 4 05:43:03 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997]
diff --git a/hash.c b/hash.c
index 74b654ee18f..ce8af6c6d96 100644
--- a/hash.c
+++ b/hash.c
@@ -1060,6 +1060,10 @@ rb_hash_replace(VALUE hash, VALUE hash2)
hash2 = to_hash(hash2);
if (hash == hash2) return hash;
rb_hash_clear(hash);
+ if (RHASH(hash2)->ntbl) {
+ rb_hash_tbl(hash);
+ RHASH(hash)->ntbl->type = RHASH(hash2)->ntbl->type;
+ }
rb_hash_foreach(hash2, replace_i, hash);
RHASH(hash)->ifnone = RHASH(hash2)->ifnone;
if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {