From 0bc2ccc712d944963d37082a1128c531d3ddd084 Mon Sep 17 00:00:00 2001
From: why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 14 May 2003 20:01:09 +0000
Subject: * ext/syck/gram.c: sequence-in-map shortcut, transfer methods on  
 sequence-in-sequence, memory leak in mapping merge. [0.28]

* ext/syck/syck.c: memory leak in domain anchoring. [0.28]

* lib/yaml/rubytypes.rb, lib/yaml/types.rb: eliminated 1.6.x code.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/yaml.rb           | 2 +-
 lib/yaml/rubytypes.rb | 3 ---
 lib/yaml/types.rb     | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/yaml.rb b/lib/yaml.rb
index b5852b225..a8bba691f 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -9,7 +9,7 @@
 module YAML
 
     begin
-        require 'syck'
+        require 'yaml/syck'
         @@parser = YAML::Syck::Parser
         @@loader = YAML::Syck::DefaultLoader
     rescue LoadError
diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb
index 1a9c4ef67..666618e49 100644
--- a/lib/yaml/rubytypes.rb
+++ b/lib/yaml/rubytypes.rb
@@ -3,9 +3,6 @@ require 'date'
 # Type conversions
 #
 
-# Ruby 1.6.x Object#object_id
-class Object; alias_method :object_id, :id; end unless Object.respond_to? :object_id
-
 class Object
     def is_complex_yaml?
         true
diff --git a/lib/yaml/types.rb b/lib/yaml/types.rb
index b34c38fe7..294fb36a5 100644
--- a/lib/yaml/types.rb
+++ b/lib/yaml/types.rb
@@ -2,9 +2,6 @@
 # Classes required by the full core typeset
 #
 
-# Ruby 1.6.x Object#object_id
-class Object; alias_method :object_id, :id; end unless Object.respond_to? :object_id
-
 module YAML
 
 	#
-- 
cgit