mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 53654:
* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name. [Fix GH-1221] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2054417ec6
commit
0e2f2ea997
3 changed files with 9 additions and 4 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Tue Jan 26 21:52:16 2016 Joseph Tibbertsma <josephtibbertsma@gmail.com>
|
||||
|
||||
* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
|
||||
[Fix GH-1221]
|
||||
|
||||
Mon Jan 18 00:34:41 2016 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* vm_insnhelper.c (vm_call_method): should not set fastpath
|
||||
|
|
|
|||
2
gc.c
2
gc.c
|
|
@ -930,7 +930,7 @@ tick(void)
|
|||
#define RVALUE_LONG_LIVED_BITMAP(obj) MARKED_IN_BITMAP(GET_HEAP_LONG_LIVED_BITS(obj), (obj))
|
||||
#define RVALUE_MARKING_BITMAP(obj) MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), (obj))
|
||||
|
||||
#define RVALUE_PAGE_WB_UNPROTECTED(apge, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj))
|
||||
#define RVALUE_PAGE_WB_UNPROTECTED(page, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj))
|
||||
#define RVALUE_PAGE_LONG_LIVED(page, obj) MARKED_IN_BITMAP((page)->long_lived_bits, (obj))
|
||||
#define RVALUE_PAGE_MARKING(page, obj) MARKED_IN_BITMAP((page)->marking_bits, (obj))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#define RUBY_VERSION "2.2.5"
|
||||
#define RUBY_RELEASE_DATE "2016-01-18"
|
||||
#define RUBY_PATCHLEVEL 236
|
||||
#define RUBY_RELEASE_DATE "2016-01-26"
|
||||
#define RUBY_PATCHLEVEL 237
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2016
|
||||
#define RUBY_RELEASE_MONTH 1
|
||||
#define RUBY_RELEASE_DAY 18
|
||||
#define RUBY_RELEASE_DAY 26
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue