diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 02:51:12 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 02:51:12 +0000 |
commit | 134de16803af02ded1a390d67a919ade19955f8a (patch) | |
tree | fa88c36c70c009bcc0cebab9b57fda9a3c0253cc /lib/rdoc/store.rb | |
parent | 92898f801d353e656935d48cb0c340fc158d77c6 (diff) | |
download | ruby-134de16803af02ded1a390d67a919ade19955f8a.tar.gz |
* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta1
This version is mostly same as r56072. It contains to remove code
for Ruby 1.8
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/store.rb')
-rw-r--r-- | lib/rdoc/store.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb index 3f91f05824..37bf03fc24 100644 --- a/lib/rdoc/store.rb +++ b/lib/rdoc/store.rb @@ -450,18 +450,12 @@ class RDoc::Store # inherit from Object, we have the above wrong inheritance. # # We fix BasicObject right away if we are running in a Ruby - # version >= 1.9. If not, we may be documenting 1.9 source - # while running under 1.8: we search the files of BasicObject - # for "object.c", and fix the inheritance if we find it. + # version >= 1.9. def fix_basic_object_inheritance basic = classes_hash['BasicObject'] return unless basic - if RUBY_VERSION >= '1.9' - basic.superclass = nil - elsif basic.in_files.any? { |f| File.basename(f.full_name) == 'object.c' } - basic.superclass = nil - end + basic.superclass = nil end ## @@ -977,4 +971,3 @@ class RDoc::Store end end - |