* variable.c (rb_copy_generic_ivar): remove old generic instance

	  variable table if it existes.

	* class.c (rb_make_metaclass): metaclass of a metaclass is a
	  metaclass itself.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 2 deletions

diff --git a/range.c b/range.c
index b7d921f40..932442af3 100644
--- a/range.c
+++ b/range.c
@@ -95,7 +95,8 @@ range_eq(range, obj)
     VALUE range, obj;
 {
     if (range == obj) return Qtrue;
-    if (!rb_obj_is_kind_of(obj, rb_obj_class(range))) return Qfalse;
+    if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
+	return Qfalse;
 
     if (!rb_equal(rb_ivar_get(range, id_beg), rb_ivar_get(obj, id_beg)))
 	return Qfalse;
@@ -153,7 +154,8 @@ range_eql(range, obj)
     VALUE range, obj;
 {
     if (range == obj) return Qtrue;
-    if (!rb_obj_is_kind_of(obj, rb_obj_class(obj))) return Qfalse;
+    if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
+	return Qfalse;
 
     if (!rb_eql(rb_ivar_get(range, id_beg), rb_ivar_get(obj, id_beg)))
 	return Qfalse;