merge revision(s) 17396:

	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
	  public methods only.  [ruby-core:17283]
	* object.c (convert_type): ditto.
	* lib/singleton.rb (Singleton#_dump): conversion method should be
	  public.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/object.c b/object.c
index cd100e419f..825056da23 100644
--- a/object.c
+++ b/object.c
@@ -2055,7 +2055,7 @@ convert_type(val, tname, method, raise)
     ID m;
 
     m = rb_intern(method);
-    if (!rb_obj_respond_to(val, m, Qtrue)) {
+    if (!rb_respond_to(val, m)) {
 	if (raise) {
 	    rb_raise(rb_eTypeError, "can't convert %s into %s",
 		     NIL_P(val) ? "nil" :