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

1 files changed, 4 insertions, 1 deletions

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