From 4e94c36f3d46cee252ba431b2c8db0b4a211b374 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 12 Jul 2009 16:18:51 +0000 Subject: * time.c (time_timeval): rounds subsecond toward zero. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ time.c | 19 +++++++------------ version.h | 6 +++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index c613c36719..011bf4fc9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 13 01:18:46 2009 Nobuyoshi Nakada + + * time.c (time_timeval): rounds subsecond toward zero. + Fri Jul 3 06:19:58 2009 Yukihiro Matsumoto * lib/complex.rb (Numeric#arg): should return NaN for NaN. diff --git a/time.c b/time.c index 01a0b104ff..584775273e 100644 --- a/time.c +++ b/time.c @@ -192,22 +192,17 @@ time_timeval(time, interval) double f, d; d = modf(RFLOAT(time)->value, &f); - if (d < 0) { - d += 1; - f -= 1; - } + if (d >= 0) { + t.tv_usec = (int)(d*1e6+0.5); + } + else if ((t.tv_usec = (int)(-d*1e6+0.5)) > 0) { + t.tv_usec = 1000000 - t.tv_usec; + f -= 1; + } t.tv_sec = (time_t)f; if (f != t.tv_sec) { rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT(time)->value); } - t.tv_usec = (int)(d*1e6+0.5); - if (t.tv_usec >= 1000000) { - t.tv_usec -= 1000000; - if (++t.tv_sec <= 0) { - --t.tv_sec; - t.tv_usec = 999999; - } - } } break; diff --git a/version.h b/version.h index 6e46dddb54..d3c884ed9f 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2009-07-03" +#define RUBY_RELEASE_DATE "2009-07-13" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20090703 +#define RUBY_RELEASE_CODE 20090713 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 13 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3