* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@2784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/string.c b/string.c
index b036cb5db7..6bd42f00d1 100644
--- a/string.c
+++ b/string.c
@@ -213,7 +213,7 @@ rb_str_to_str(str)
 }
 
 static void
-rb_str_become(str, str2)
+rb_str_shared_replace(str, str2)
     VALUE str, str2;
 {
     if (str == str2) return;
@@ -1071,7 +1071,7 @@ rb_str_succ_bang(str)
     VALUE str;
 {
     rb_str_modify(str);
-    rb_str_become(str, rb_str_succ(str));
+    rb_str_shared_replace(str, rb_str_succ(str));
 
     return str;
 }