From f5b06413cabbedfdd320eb36c68577db8fa99c4f Mon Sep 17 00:00:00 2001
From: tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 3 Jun 2012 12:21:18 +0000
Subject: 	* marshal.c: calls directly
 rb_{Complex,Rational}_marshal_load(). 	  But now disabled. [experimental] 
 * complex.c: followed the above. 	* rational.c: ditto. 	*
 include/rub/intern.h: ditto.

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

(limited to 'complex.c')

diff --git a/complex.c b/complex.c
index c5303c10d9..6036ab72fd 100644
--- a/complex.c
+++ b/complex.c
@@ -1283,6 +1283,21 @@ 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
@@ -1970,6 +1985,7 @@ 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);
@@ -1977,6 +1993,10 @@ Init_Complex(void)
     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