3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c4c20f6fba..a497a5551e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index c301de77d8..b2eee83455 100644
--- a/version.h
+++ b/version.h
@@ -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