archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 33795,33796:

Browse source 
* 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
This commit is contained in:
naruse 2012-02-10 08:28:48 +00:00
parent d91a05c887
commit c3e465b5ee
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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

5
lib/set.rb
View file

@ -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

2
version.h
View file

@ -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