aboutsummaryrefslogtreecommitdiffstats
path: root/marshal.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-03 21:12:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-03 21:12:46 +0000
commitf392a8aa9bcf80f57e6c7ac5ea5fd714922e2ac6 (patch)
treec40ff5ec955424bab06b1241124c0e5c4d650f58 /marshal.c
parenteb6579e6474126b56e32ff8951c2ba5fee064791 (diff)
downloadruby-f392a8aa9bcf80f57e6c7ac5ea5fd714922e2ac6.tar.gz
remove old warning
* marshal.c (r_object0): remove old warning for _alloc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c14
1 files changed, 2 insertions, 12 deletions
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");
}