From eb6579e6474126b56e32ff8951c2ba5fee064791 Mon Sep 17 00:00:00 2001
From: tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 3 Jun 2012 19:26:58 +0000
Subject: 	* marshal.c: experimental test aborted. 	* complex.c:
 ditto. 	* rational.c: ditto. 	* include/ruby/intern.h: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 complex.c | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)

(limited to 'complex.c')

diff --git a/complex.c b/complex.c
index 6036ab72fd..1aae3b6ca8 100644
--- a/complex.c
+++ b/complex.c
@@ -1254,17 +1254,6 @@ nucomp_marshal_dump(VALUE self)
     return a;
 }
 
-#ifdef MARSHAL_OLD_STYLE
-/* :nodoc: */
-static VALUE
-nucomp_marshal__dump(VALUE self, VALUE limit)
-{
-    VALUE arg;
-    arg = nucomp_marshal_dump(self);
-    return rb_marshal_dump(arg, Qnil);
-}
-#endif
-
 /* :nodoc: */
 static VALUE
 nucomp_marshal_load(VALUE self, VALUE a)
@@ -1283,30 +1272,6 @@ nucomp_marshal_load(VALUE self, VALUE a)
     return self;
 }
 
-#ifdef MARSHAL_LOAD_DIRECT
-/* :nodoc: */
-static VALUE
-nucomp_marshal_load_fake(VALUE self, VALUE a)
-{
-    rb_raise(rb_eNotImpError, "not implemented");
-}
-
-VALUE
-rb_Complex_marshal_load(VALUE obj, VALUE a)
-{
-    return nucomp_marshal_load(obj, a);
-}
-#endif
-
-#ifdef MARSHAL_OLD_STYLE
-/* :nodoc: */
-static VALUE
-nucomp_marshal__load(VALUE klass, VALUE s)
-{
-    return nucomp_marshal_load(nucomp_s_alloc(klass), rb_marshal_load(s));
-}
-#endif
-
 /* --- */
 
 VALUE
@@ -1985,18 +1950,8 @@ Init_Complex(void)
     rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
     rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
 
-#ifndef MARSHAL_LOAD_DIRECT
-#ifndef MARSHAL_OLD_STYLE
     rb_define_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
     rb_define_method(rb_cComplex, "marshal_load", nucomp_marshal_load, 1);
-#else
-    rb_define_method(rb_cComplex, "_dump", nucomp_marshal__dump, 1);
-    rb_define_singleton_method(rb_cComplex, "_load", nucomp_marshal__load, 1);
-#endif
-#else
-    rb_define_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
-    rb_define_method(rb_cComplex, "marshal_load", nucomp_marshal_load_fake, 1);
-#endif
 
     /* --- */
 
-- 
cgit v1.2.3