From f2bd0ce9933be0d7a9c94a5f1b41f85f75eff6a6 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Sep 2011 08:28:42 +0000
Subject: [PATCH] * 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
---
 ChangeLog              | 5 +++++
 lib/yaml.rb            | 2 +-
 test/syck/test_yaml.rb | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c38c2d634f..5a1e4c0849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  7 17:27:18 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/yaml.rb: explicitly specify ::Object to avoid the collision with
+	  Syck::Object.
+
 Tue Sep  6 21:06:49 2011  Shota Fukumori  <sorah@tubusu.net>
 
 	* lib/test/unit.rb (_run_suites): Now reports are written the
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
diff --git a/test/syck/test_yaml.rb b/test/syck/test_yaml.rb
index 7edf79dbe6..f980a75c9c 100644
--- a/test/syck/test_yaml.rb
+++ b/test/syck/test_yaml.rb
@@ -3,6 +3,7 @@
 # $Id$
 #
 require 'test/unit'
+require 'syck'
 require 'yaml'
 require 'syck/ypath'