summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 14:28:55 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 14:28:55 +0000
commit16e52471d5a79520f4ac12225f07b1876bb6d3d4 (patch)
tree3fc12108fc815abe13b0ea90bacd8c043d27bd3f /object.c
parent4dfafee3fe4c13a07b8736bac13c7027e9e3efbc (diff)
merge revision(s) 16654:
* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search private methods too. [ruby-dev:34671] * object.c (convert_type): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r--object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/object.c b/object.c
index 60df9b3386..19d30a13d9 100644
--- a/object.c
+++ b/object.c
@@ -2133,7 +2133,7 @@ convert_type(val, tname, method, raise)
ID m;
m = rb_intern(method);
- if (!rb_respond_to(val, m)) {
+ if (!rb_obj_respond_to(val, m, Qtrue)) {
if (raise) {
rb_raise(rb_eTypeError, "can't convert %s into %s",
NIL_P(val) ? "nil" :