summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-07 08:28:42 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-07 08:28:42 +0000
commitf2bd0ce9933be0d7a9c94a5f1b41f85f75eff6a6 (patch)
treea27a6bb559574d85ecab8992388bb3f5842a95dc /lib
parent5a883a2cf45d582e407fce9931d6c954a3786c3f (diff)
* lib/yaml.rb: explicitly specify ::Object to avoid the collision with
Syck::Object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/yaml.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/yaml.rb b/lib/yaml.rb
index ff9e1a6344..6ae71fb1dc 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -30,7 +30,7 @@ module YAML
require engine unless (engine == 'syck' ? Syck : Psych).const_defined?(:VERSION)
- Object.class_eval <<-eorb, __FILE__, __LINE__ + 1
+ ::Object.class_eval <<-eorb, __FILE__, __LINE__ + 1
remove_const 'YAML'
YAML = #{engine.capitalize}
remove_method :to_yaml