summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-05 08:56:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-05 08:56:42 +0000
commit1a3f4dbafad89a13c5007c23e3fcd15847cb2304 (patch)
treea433b5a7d744da95e96bd32441ead7e69de739df
parent504e6b4dacf4071ffc8ead7460098fe560de4f04 (diff)
* class.c (make_metaclass): fix probable typo. builtin type flag
cannot be used with FL_TEST. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--class.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d12cc150b6..388d7c7f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 5 17:56:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
diff --git a/class.c b/class.c
index 6d64873ff3..76f4ef8622 100644
--- a/class.c
+++ b/class.c
@@ -314,7 +314,7 @@ make_metaclass(VALUE klass)
}
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));