diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-23 13:25:12 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-23 13:25:12 +0000 |
commit | a0cac92b342029343c432d0e45840c8cdf61110b (patch) | |
tree | f092cb24423872972eecbb4f0989341fc3d71a31 | |
parent | 703bd1759453b14a8d60b9d39a084df925e3fd2e (diff) | |
download | ruby-a0cac92b342029343c432d0e45840c8cdf61110b.tar.gz |
* process.c (rb_clock_gettime): Add a cast to fix compile error by
-Werror,-Wshorten-64-to-32.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | process.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Aug 23 22:22:07 2013 Tanaka Akira <akr@fsij.org> + + * process.c (rb_clock_gettime): Add a cast to fix compile error by + -Werror,-Wshorten-64-to-32. + Fri Aug 23 22:12:13 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * process.c (rb_intern): no symbol cache while initialization. @@ -6989,7 +6989,7 @@ rb_clock_gettime(int argc, VALUE *argv) if (ret != 0) rb_sys_fail("getrusage"); tt.giga_count = usage.ru_utime.tv_sec + usage.ru_stime.tv_sec; - usec = usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; + usec = (int32_t)(usage.ru_utime.tv_usec + usage.ru_stime.tv_usec); if (1000000 <= usec) { tt.giga_count++; usec -= 1000000; |