summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-29 00:13:58 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-29 00:13:58 +0000
commitb5b827310a6c322dd5ec4019580a8ff5ba238370 (patch)
tree85424217980ee1b6a1d07ecf5c70b2b997e8e38e
parent21b9680f481c83237418f8f93dc746e6f301ae7f (diff)
downloadruby-b5b827310a6c322dd5ec4019580a8ff5ba238370.tar.gz
ruby-b5b827310a6c322dd5ec4019580a8ff5ba238370.tar.xz
ruby-b5b827310a6c322dd5ec4019580a8ff5ba238370.zip
* object.c (rb_class_real): use BUILTIN_TYPE instead of TYPE.
access flags directly intead of FL_TEST. they are enough because cl argument is a class. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--object.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b1719464c..24363fe6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 29 09:12:02 2007 Tanaka Akira <akr@fsij.org>
+
+ * object.c (rb_class_real): use BUILTIN_TYPE instead of TYPE.
+ access flags directly intead of FL_TEST.
+ they are enough because cl argument is a class.
+
Sat Sep 29 08:57:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/win32.h (strcasecmp): needed for type_strcasehash.
diff --git a/object.c b/object.c
index e2b3e43bd..a6ded5672 100644
--- a/object.c
+++ b/object.c
@@ -99,7 +99,7 @@ rb_obj_equal(VALUE obj1, VALUE obj2)
VALUE
rb_class_real(VALUE cl)
{
- while (FL_TEST(cl, FL_SINGLETON) || TYPE(cl) == T_ICLASS) {
+ while ((RBASIC(cl)->flags & FL_SINGLETON) || BUILTIN_TYPE(cl) == T_ICLASS) {
cl = RCLASS_SUPER(cl);
}
return cl;