diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 08:48:44 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 08:48:44 +0000 |
commit | b4f1eaa4933185797a202e8d0486cfd15fe19457 (patch) | |
tree | 5dc70a10a2a7bc04c605f0fad5a71446e8097287 | |
parent | 39f09ca13f5f1d421fb69656e91f896371cf101b (diff) | |
download | ruby-b4f1eaa4933185797a202e8d0486cfd15fe19457.tar.gz |
* ext/openssl/lib/openssl/x509-internal.rb, lib/forwardable.rb,
lib/irb/cmd/fork.rb, lib/mutex_m.rb,
lib/shell/process-controller.rb, lib/sync.rb, object.c:
suppress warnings patched by Benoit Daloze at [ruby-core:30366].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27967 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/openssl/lib/openssl/x509-internal.rb | 2 | ||||
-rw-r--r-- | lib/forwardable.rb | 2 | ||||
-rw-r--r-- | lib/irb/cmd/fork.rb | 2 | ||||
-rw-r--r-- | lib/mutex_m.rb | 2 | ||||
-rw-r--r-- | lib/shell/process-controller.rb | 2 | ||||
-rw-r--r-- | lib/sync.rb | 2 | ||||
-rw-r--r-- | object.c | 2 |
8 files changed, 13 insertions, 8 deletions
@@ -1,4 +1,9 @@ -Sun May 23 17:40:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun May 23 17:48:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/lib/openssl/x509-internal.rb, lib/forwardable.rb, + lib/irb/cmd/fork.rb, lib/mutex_m.rb, + lib/shell/process-controller.rb, lib/sync.rb, object.c: + suppress warnings patched by Benoit Daloze at [ruby-core:30366]. * parse.y (warn_balanced): no warning for singleton class. [ruby-core:30366] diff --git a/ext/openssl/lib/openssl/x509-internal.rb b/ext/openssl/lib/openssl/x509-internal.rb index 6aff4ca10d..c3de83be66 100644 --- a/ext/openssl/lib/openssl/x509-internal.rb +++ b/ext/openssl/lib/openssl/x509-internal.rb @@ -135,7 +135,7 @@ module OpenSSL end end - class <<self + class << self def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE) ary = OpenSSL::X509::Name::RFC2253DN.scan(str) self.new(ary, template) diff --git a/lib/forwardable.rb b/lib/forwardable.rb index 39b35d9cee..06f157170d 100644 --- a/lib/forwardable.rb +++ b/lib/forwardable.rb @@ -135,7 +135,7 @@ module Forwardable FORWARDABLE_VERSION = "1.1.0" @debug = nil - class<<self + class << self attr_accessor :debug end diff --git a/lib/irb/cmd/fork.rb b/lib/irb/cmd/fork.rb index 45350cb1b7..c2664626ae 100644 --- a/lib/irb/cmd/fork.rb +++ b/lib/irb/cmd/fork.rb @@ -18,7 +18,7 @@ module IRB def execute(&block) pid = send ExtendCommand.irb_original_method_name("fork") unless pid - class<<self + class << self alias_method :exit, ExtendCommand.irb_original_method_name('exit') end if iterator? diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb index 21d828523e..081bb788e4 100644 --- a/lib/mutex_m.rb +++ b/lib/mutex_m.rb @@ -52,7 +52,7 @@ module Mutex_m defined? unlock and defined? try_lock and defined? synchronize) - Mutex_m.define_aliases(class<<self;self;end) + Mutex_m.define_aliases(singleton_class) end mu_initialize end diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb index ac7697dd5d..2198b88d51 100644 --- a/lib/shell/process-controller.rb +++ b/lib/shell/process-controller.rb @@ -23,7 +23,7 @@ class Shell @BlockOutputMonitor = Mutex.new @BlockOutputCV = ConditionVariable.new - class<<self + class << self extend Forwardable def_delegator("@ProcessControllersMonitor", diff --git a/lib/sync.rb b/lib/sync.rb index 459bba732b..b97d36eb43 100644 --- a/lib/sync.rb +++ b/lib/sync.rb @@ -106,7 +106,7 @@ module Sync_m defined? unlock and defined? try_lock and defined? synchronize) - Sync_m.define_aliases(class<<self;self;end) + Sync_m.define_aliases(singleton_class) end sync_initialize end @@ -608,7 +608,7 @@ rb_obj_tap(VALUE obj) * def self.one() end * def two() end * def Chatty.three() end - * class <<self + * class << self * remove_method :three * remove_method :one * end |