summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-17 16:53:46 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-17 16:53:46 +0000
commite2f37fb9c6c9df54b2be78d09de00aa7da0d694f (patch)
tree36b061ca3760f5a5d24d06690c610c3dff6925a1
parentfcf931c0e5992bb7fbb7b8b18ce78bb2cd899cf8 (diff)
* ext/tk/lib/multi-tk.rb: cannot access class variable from singleton method.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/lib/multi-tk.rb7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9eccd7e35b..5ee8ec32c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 18 01:51:10 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: cannot access class variable from
+ singleton method.
+
Wed Jun 18 00:03:33 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* dir.c (Init_Dir): dir_foreach() takes variable argument.
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 4f39874d30..4bc89a8147 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -2214,11 +2214,12 @@ end
# event loop
# all master/slave IPs are controled by only one event-loop
-class << MultiTkIp
- def default_master?
+class MultiTkIp
+ def self.default_master?
__getip == @@DEFAULT_MASTER
end
-
+end
+class << MultiTkIp
def mainloop(check_root = true)
__getip.mainloop(check_root)
end