[ruby-cvs:51991] naruse:r44846 (ruby_2_1): merge revision(s) 44525, 44534, 44537: [Backport #9381]

naruse at ruby-lang.org naruse at ruby-lang.org
Wed Feb 5 23:53:49 JST 2014


naruse	2014-02-05 23:53:48 +0900 (Wed, 05 Feb 2014)

  New Revision: 44846

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

  Log:
    merge revision(s) 44525,44534,44537: [Backport #9381]
    
    * hash.c (rb_objid_hash): return hash value from object ID with a
      salt, extract from rb_any_hash().
    
    * object.c (rb_obj_hash): return same value as rb_any_hash().
      fix r44125.  [ruby-core:59638] [Bug #9381]
    
    * hash.c (rb_any_hash): should treat the return value of rb_objid_hash()
      as `long', because ruby assumes the object id of an object is `long'.
      this fixes test failures on mswin64 introduced at r44525.
    
    * hash.c (rb_objid_hash): should return `long'.  brushup r44534.
    
    * object.c (rb_obj_hash): follow above change.
      as `long', because ruby assumes the hash value of the object id of
      an object is `long'.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/hash.c
    branches/ruby_2_1/object.c
    branches/ruby_2_1/test/ruby/test_hash.rb
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list