naruse	2012-02-10 17:28:48 +0900 (Fri, 10 Feb 2012)

  New Revision: 34533

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34533

  Log:
    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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/set.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34532)
+++ ruby_1_9_3/ChangeLog	(revision 34533)
@@ -1,3 +1,9 @@
+Fri Feb 10 17:25:28 2012  Tanaka Akira  <akr@f...>
+
+	* 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@g...>
 
 	* thread_pthread.c (rb_thread_create_timer_thread): fix memory
Index: ruby_1_9_3/lib/set.rb
===================================================================
--- ruby_1_9_3/lib/set.rb	(revision 34532)
+++ ruby_1_9_3/lib/set.rb	(revision 34533)
@@ -525,7 +525,6 @@
       module_eval {
         # a hack to shut up warning
         alias old_init initialize
-        remove_method :old_init
       }
       begin
         require 'rbtree'
@@ -605,6 +604,10 @@
           end
         }
       end
+      module_eval {
+        # a hack to shut up warning
+        remove_method :old_init
+      }
 
       @@setup = true
     end
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34532)
+++ ruby_1_9_3/version.h	(revision 34533)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/