* lib/delegate.rb (DelegateClass, Delegator#respond_to?):

  respond_to? must take optional second argument.  This was a
  latent bug exposed by a recent internal change of marshal.c to
  call respond_to? with a second argument; submitted by Jeremy
  Kemper <jeremy at bitsweat.net> in [ruby-core:17045].


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

3 files changed, 17 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index cc537c6e8d..72bb59fe61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jun  2 19:47:16 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/delegate.rb (DelegateClass, Delegator#respond_to?):
+	  respond_to? must take optional second argument.  This was a
+	  latent bug exposed by a recent internal change of marshal.c to
+	  call respond_to? with a second argument; submitted by Jeremy
+	  Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
+
 Sat May 31 23:53:35 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* .: Release as Ruby 1.8.7.
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 971b4a4aec..0bf5cae7cb 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -163,9 +163,9 @@ class Delegator
   # Checks for a method provided by this the delegate object by fowarding the 
   # call through \_\_getobj\_\_.
   # 
-  def respond_to?(m)
+  def respond_to?(m, include_private = false)
     return true if super
-    return self.__getobj__.respond_to?(m)
+    return self.__getobj__.respond_to?(m, include_private)
   end
 
   #
@@ -270,9 +270,9 @@ def DelegateClass(superclass)
       end
       @_dc_obj.__send__(m, *args)
     end
-    def respond_to?(m)  # :nodoc:
+    def respond_to?(m, include_private = false)  # :nodoc:
       return true if super
-      return @_dc_obj.respond_to?(m)
+      return @_dc_obj.respond_to?(m, include_private)
     end
     def __getobj__  # :nodoc:
       @_dc_obj
diff --git a/version.h b/version.h
index f9e492a6eb..191cde7a98 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-05-31"
+#define RUBY_RELEASE_DATE "2008-06-02"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080531
-#define RUBY_PATCHLEVEL 0
+#define RUBY_RELEASE_CODE 20080602
+#define RUBY_PATCHLEVEL 1
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 6
+#define RUBY_RELEASE_DAY 2
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];