diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-10 08:28:48 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-10 08:28:48 +0000 |
commit | c3e465b5eefafa583ab5a9f9bc1c504e1ae80c75 (patch) | |
tree | 29fa604c4ce65783ee78acbc328ce2042e880e11 | |
parent | d91a05c8874dec82c73e50151136de51b7413477 (diff) |
merge revision(s) 33795,33796:
* lib/set.rb (SortedSet.setup): don't remove old_init. The remove
makes the warning prevention fragile. [ruby-dev:44892]
* lib/set.rb (SortedSet.setup): remove old_init after initialize
method is redefined. The remove before redefinition makes the
warning prevention fragile. [ruby-dev:44892]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | lib/set.rb | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Feb 10 17:25:28 2012 Tanaka Akira <akr@fsij.org> + + * lib/set.rb (SortedSet.setup): remove old_init after initialize + method is redefined. The remove before redefinition makes the + warning prevention fragile. [ruby-dev:44892] + Fri Feb 10 17:02:12 2012 okkez <okkez000@gmail.com> * thread_pthread.c (rb_thread_create_timer_thread): fix memory diff --git a/lib/set.rb b/lib/set.rb index 43edc7557a..07031bf894 100755 --- a/lib/set.rb +++ b/lib/set.rb @@ -525,7 +525,6 @@ class SortedSet < Set module_eval { # a hack to shut up warning alias old_init initialize - remove_method :old_init } begin require 'rbtree' @@ -605,6 +604,10 @@ class SortedSet < Set end } end + module_eval { + # a hack to shut up warning + remove_method :old_init + } @@setup = true end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 81 +#define RUBY_PATCHLEVEL 82 #define RUBY_RELEASE_DATE "2012-02-10" #define RUBY_RELEASE_YEAR 2012 |