diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 10:36:30 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 10:36:30 +0000 |
commit | ef72effc0c46312af745fb268e9bb764ee600bfe (patch) | |
tree | 79348d2673e8e51ca6019e868014470aeffad834 /lib/monitor.rb | |
parent | 0889e6347259f725517ddfc667e4b6f4e6d94b1b (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/monitor.rb')
-rw-r--r-- | lib/monitor.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb index 31234819b8..2f2bb1661b 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -91,13 +91,13 @@ module MonitorMixin 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 @@ module MonitorMixin 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 @@ module MonitorMixin def self.extend_object(obj) super(obj) - obj.send(:mon_initialize) + obj.__send__(:mon_initialize) end # |