naruse	2015-02-19 17:06:06 +0900 (Thu, 19 Feb 2015)

  New Revision: 49649

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

  Log:
    merge revision(s) 49503:
    
    * class.c (rb_obj_singleton_methods): should use RTEST() to convert
      VALUE to int.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/class.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49648)
+++ ruby_2_2/ChangeLog	(revision 49649)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Feb 19 17:05:47 2015  Shugo Maeda  <shugo@r...>
+
+	* class.c (rb_obj_singleton_methods): should use RTEST() to convert
+	  VALUE to int.
+
 Thu Feb 19 16:14:04 2015  Shugo Maeda  <shugo@r...>
 
 	* class.c (method_entry_i, class_instance_method_list,
Index: ruby_2_2/class.c
===================================================================
--- ruby_2_2/class.c	(revision 49648)
+++ ruby_2_2/class.c	(revision 49649)
@@ -1400,7 +1400,7 @@ rb_obj_singleton_methods(int argc, const https://github.com/ruby/ruby/blob/trunk/ruby_2_2/class.c#L1400
     klass = CLASS_OF(obj);
     origin = RCLASS_ORIGIN(klass);
     me_arg.list = st_init_numtable();
-    me_arg.recur = recur;
+    me_arg.recur = RTEST(recur);
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
 	if ((mtbl = RCLASS_M_TBL(origin)) != 0)
 	    st_foreach(mtbl, method_entry_i, (st_data_t)&me_arg);
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49648)
+++ ruby_2_2/version.h	(revision 49649)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-19"
-#define RUBY_PATCHLEVEL 59
+#define RUBY_PATCHLEVEL 60
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2

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


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