diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:39:09 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:39:09 +0000 |
| commit | 01d1a35a77f6dc2e522d27379d5a52b8e8a1e9eb (patch) | |
| tree | 77895cd7c466f40a1284e2fee1d4c2ed540dd30b /variable.c | |
| parent | 3360e3e7eafd0a7c19af8dc13b9adba4baee0c48 (diff) | |
merges r32342 from trunk into ruby_1_9_2.
--
* class.c (Init_class_hierarchy): should name BasicObject
explicitly.
* variable.c (rb_const_defined_0): should not check for
superclasses as const_get.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/variable.c b/variable.c index 57e37fb779..71ef831b4e 100644 --- a/variable.c +++ b/variable.c @@ -1779,7 +1779,7 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse) return (int)Qfalse; return (int)Qtrue; } - if (!recurse && klass != rb_cObject) break; + if (!recurse) break; tmp = RCLASS_SUPER(tmp); } if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { |