nagachika	2016-01-26 21:54:04 +0900 (Tue, 26 Jan 2016)

  New Revision: 53662

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53662

  Log:
    merge revision(s) 53654:
    
    * gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
      [Fix GH-1221]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/gc.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 53661)
+++ ruby_2_2/ChangeLog	(revision 53662)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Jan 26 21:52:16 2016  Joseph Tibbertsma  <josephtibbertsma@g...>
+
+	* 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@a...>
 
 	* vm_insnhelper.c (vm_call_method): should not set fastpath
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 53661)
+++ ruby_2_2/version.h	(revision 53662)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 
Index: ruby_2_2/gc.c
===================================================================
--- ruby_2_2/gc.c	(revision 53661)
+++ ruby_2_2/gc.c	(revision 53662)
@@ -930,7 +930,7 @@ tick(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/gc.c#L930
 #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))
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53654


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