summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 15:37:01 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 15:37:01 +0000
commit29ff037211ba5a7516931d691cb6cc33f77ca6a9 (patch)
tree90e5224d6b650b76ff32e87f731c1d9f07226b2e /ChangeLog
parent2b2ccf4235296dde3fdbbe0e2519d1e6ea4ef3ea (diff)
merge revision(s) 38493,38539: [Backport #7454]
* gc.c (nonspecial_obj_id): VALUE is not compatible with Fixnum on LLP64 platform, such as 64bit Windows. reporeted by Heesob Park at [ruby-core:50255] [Bug #7454], and the fix is suggested by akr. * object.c (rb_obj_hash): shouldn't assume object_id can be long. based on a patch by Heesob Park at [ruby-core:51060]. cf. [Backport #7454] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f7fab3ca12..8e28160a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sat Dec 22 00:33:28 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * object.c (rb_obj_hash): shouldn't assume object_id can be long.
+ based on a patch by Heesob Park at [ruby-core:51060].
+ cf. [Backport #7454]
+
+Sat Dec 22 00:33:28 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * gc.c (nonspecial_obj_id): VALUE is not compatible with Fixnum on
+ LLP64 platform, such as 64bit Windows.
+ reporeted by Heesob Park at [ruby-core:50255] [Bug #7454], and the
+ fix is suggested by akr.
+
Fri Dec 21 16:03:54 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is