merge revision(s) 49503:

	* class.c (rb_obj_singleton_methods): should use RTEST() to convert
	  VALUE to int.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0bb8500d63..e70567f9a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 19 17:05:47 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* class.c (rb_obj_singleton_methods): should use RTEST() to convert
+	  VALUE to int.
+
 Thu Feb 19 16:14:04 2015  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* class.c (method_entry_i, class_instance_method_list,
diff --git a/class.c b/class.c
index a33cb9aaae..48e24e79d6 100644
--- a/class.c
+++ b/class.c
@@ -1400,7 +1400,7 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
     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);
diff --git a/version.h b/version.h
index bdf14118e6..59d2a85ae0 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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