From c4845b3ced5d233ad9138de70178ae211935c3b2 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 1 May 2009 07:52:09 +0000
Subject: * lib/set.rb (Set#merge): Only directly use the passed objects  
 @hash instance variable when self and the passed object are   instances of
 the same class. [Bug #118]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/set.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/set.rb b/lib/set.rb
index ec42b93fa..5be2bce76 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -276,8 +276,8 @@ class Set
   # Merges the elements of the given enumerable object to the set and
   # returns self.
   def merge(enum)
-    if enum.is_a?(Set)
-      @hash.update(enum.instance_eval { @hash })
+    if enum.instance_of?(self.class)
+      @hash.update(enum.instance_variable_get(:@hash))
     else
       enum.each { |o| add(o) }
     end
-- 
cgit