yugui	2010-12-23 19:49:25 +0900 (Thu, 23 Dec 2010)

  New Revision: 30311

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

  Log:
    merges r30086 from trunk into ruby_1_9_2.
    --
    * class.c (make_metaclass): fix probable typo.  builtin type flag
      cannot be used with FL_TEST.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/class.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30310)
+++ ruby_1_9_2/ChangeLog	(revision 30311)
@@ -1,3 +1,8 @@
+Sun Dec  5 17:56:36 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* class.c (make_metaclass): fix probable typo.  builtin type flag
+	  cannot be used with FL_TEST.
+
 Sun Dec  5 12:09:27 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
Index: ruby_1_9_2/class.c
===================================================================
--- ruby_1_9_2/class.c	(revision 30310)
+++ ruby_1_9_2/class.c	(revision 30311)
@@ -293,7 +293,7 @@
     }
 
     super = RCLASS_SUPER(klass);
-    while (FL_TEST(super, T_ICLASS)) super = RCLASS_SUPER(super);
+    while (RB_TYPE_P(super, T_ICLASS)) super = RCLASS_SUPER(super);
     RCLASS_SUPER(metaclass) = super ? ENSURE_EIGENCLASS(super) : rb_cClass;
 
     OBJ_INFECT(metaclass, RCLASS_SUPER(metaclass));
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30310)
+++ ruby_1_9_2/version.h	(revision 30311)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 116
+#define RUBY_PATCHLEVEL 117
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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