aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-12 12:09:22 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-12 12:09:22 +0000
commit1afbc783d4c1b4c21c6dca9e39978a1259f74500 (patch)
tree4cefa4ce6685a3f758bbcb91365df550404ebfc5
parentef9fe8219c7a95a05c2ccd4fd8551208657aa16e (diff)
downloadruby-1afbc783d4c1b4c21c6dca9e39978a1259f74500.tar.gz
* ext/date/date_core.c (d_lite_marshal_load): should give converted value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/date_core.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eee9a7284c..1067baef58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 12 21:01:56 2011 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/date_core.c (d_lite_marshal_load): should give converted value.
+
Sun Jun 12 20:36:30 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c: edited doc.
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 93cbadedb1..6656e9b88d 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -7079,7 +7079,7 @@ d_lite_marshal_load(VALUE self, VALUE a)
&nth, &jd, &df, &sf, &rof, &rsg);
if (!df && f_zero_p(sf) && !rof) {
- set_to_simple(&dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
+ set_to_simple(&dat->s, nth, jd, rsg, 0, 0, 0, HAVE_JD);
} else {
if (!complex_dat_p(dat))
rb_raise(rb_eArgError,