summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-24 01:32:01 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-24 01:32:01 +0000
commitb434ae19825a397393a2328a234ca2ad17bfd2ff (patch)
tree87e169cfc369c6880ea4f5bfd1dd2ec4297e1e2e
parentbcf67b862b44ea3b0ddb453895983915f80981fe (diff)
downloadruby-b434ae19825a397393a2328a234ca2ad17bfd2ff.tar.gz
ruby-b434ae19825a397393a2328a234ca2ad17bfd2ff.tar.xz
ruby-b434ae19825a397393a2328a234ca2ad17bfd2ff.zip
* lib/object.c (rb_obj_cmp): Default <=> operator returns 0 if objects are == [ruby-core:24063]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--object.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6378ab172..593925999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 24 10:31:50 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/object.c (rb_obj_cmp): Default <=> operator returns 0 if
+ objects are == [ruby-core:24063]
+
Wed Dec 23 09:12:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
diff --git a/object.c b/object.c
index 503a7c50b..58ca4c126 100644
--- a/object.c
+++ b/object.c
@@ -1131,7 +1131,7 @@ rb_obj_not_match(VALUE obj1, VALUE obj2)
static VALUE
rb_obj_cmp(VALUE obj1, VALUE obj2)
{
- if (obj1 == obj2 || rb_obj_equal(obj1, obj2))
+ if (obj1 == obj2 || rb_equal(obj1, obj2))
return INT2FIX(0);
return Qnil;
}