2 files changed, 6 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index a4ebf8225c..5ac2aedfc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun  4 06:12:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): remove old warning for _alloc.
+
 Mon Jun  4 04:24:06 2012  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* marshal.c: experimental test aborted.
diff --git a/marshal.c b/marshal.c
index 046729d364..0cf6235dcb 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1644,18 +1644,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
       case TYPE_DATA:
        {
            VALUE klass = path2class(r_unique(arg));
-           if (rb_respond_to(klass, s_alloc)) {
-	       static int warn = TRUE;
-	       if (warn) {
-		   rb_warn("define `allocate' instead of `_alloc'");
-		   warn = FALSE;
-	       }
-	       v = rb_funcall(klass, s_alloc, 0);
-	       check_load_arg(arg, s_alloc);
-           }
-	   else {
-	       v = rb_obj_alloc(klass);
-	   }
+
+	   v = rb_obj_alloc(klass);
            if (!RB_TYPE_P(v, T_DATA)) {
                rb_raise(rb_eArgError, "dump format error");
            }