yugui	2009-06-21 19:36:30 +0900 (Sun, 21 Jun 2009)

  New Revision: 23806

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23806

  Log:
    merges r23754 from trunk into ruby_1_9_1.
    --
    * lib/monitor.rb (MonitorMixin::extend_object): should use
      #__send__ instead of #send to avoid possible name conflict.  
      [ruby-core:23907]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/monitor.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23805)
+++ ruby_1_9_1/ChangeLog	(revision 23806)
@@ -1,3 +1,9 @@
+Sat Jun 20 07:17:52 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/monitor.rb (MonitorMixin::extend_object): should use
+	  #__send__ instead of #send to avoid possible name conflict.  
+	  [ruby-core:23907]
+
 Fri Jun 19 20:53:54 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]
Index: ruby_1_9_1/lib/monitor.rb
===================================================================
--- ruby_1_9_1/lib/monitor.rb	(revision 23805)
+++ ruby_1_9_1/lib/monitor.rb	(revision 23806)
@@ -91,13 +91,13 @@
       if timeout
         raise NotImplementedError, "timeout is not implemented yet"
       end
-      @monitor.send(:mon_check_owner)
-      count = @monitor.send(:mon_exit_for_cond)
+      @monitor.__send__(:mon_check_owner)
+      count = @monitor.__send__(:mon_exit_for_cond)
       begin
         @cond.wait(@monitor.instance_variable_get("@mon_mutex"))
         return true
       ensure
-        @monitor.send(:mon_enter_for_cond, count)
+        @monitor.__send__(:mon_enter_for_cond, count)
       end
     end
     
@@ -114,12 +114,12 @@
     end
     
     def signal
-      @monitor.send(:mon_check_owner)
+      @monitor.__send__(:mon_check_owner)
       @cond.signal
     end
     
     def broadcast
-      @monitor.send(:mon_check_owner)
+      @monitor.__send__(:mon_check_owner)
       @cond.broadcast
     end
     
@@ -137,7 +137,7 @@
   
   def self.extend_object(obj)
     super(obj)
-    obj.send(:mon_initialize)
+    obj.__send__(:mon_initialize)
   end
   
   #
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23805)
+++ ruby_1_9_1/version.h	(revision 23806)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 196
+#define RUBY_PATCHLEVEL 197
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/