From f4d9d3d39b2018ea5330c1b21db722cd29ca11b4 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 20 Sep 2007 17:03:41 +0000 Subject: * hash.c (hash_equal): should call rb_eql when argument eql is set. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ hash.c | 5 ++++- version.h | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 761f022180..2ae99763e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 21 02:02:34 2007 Yukihiro Matsumoto + + * hash.c (hash_equal): should call rb_eql when argument eql is set. + Thu Sep 20 17:28:00 2007 Nobuyoshi Nakada * io.c (popen_exec), process.c (rb_spawn): stop other threads before diff --git a/hash.c b/hash.c index d236fa8fa5..11d93af3b9 100644 --- a/hash.c +++ b/hash.c @@ -1398,7 +1398,10 @@ hash_equal(VALUE hash1, VALUE hash2, int eql) if (!rb_respond_to(hash2, rb_intern("to_hash"))) { return Qfalse; } - return rb_equal(hash2, hash1); + if (eql) + return rb_eql(hash2, hash1); + else + return rb_equal(hash2, hash1); } if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2)) return Qfalse; diff --git a/version.h b/version.h index 5634b8bce8..4da546a82c 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-09-20" +#define RUBY_RELEASE_DATE "2007-09-21" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070920 +#define RUBY_RELEASE_CODE 20070921 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3