archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 57172: [Backport #13066]

Browse source 
time.c: fix type of usec2subsecx

	* time.c (usec2subsecx): fix return type, which is a numeric
  object but not a long int.  [ruby-dev:49912] [Bug #13066]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-12-27 11:44:17 +00:00
parent 244096b9a1
commit 7015fcf9f8
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Dec 27 20:43:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (usec2subsecx): fix return type, which is a numeric object but
not a long int. [Bug #13066]
Tue Dec 27 20:39:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Dec 27 20:39:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (exc_setup_cause): always set cause of cause to get rid of * eval.c (exc_setup_cause): always set cause of cause to get rid of

2
time.c
View file

@ -2562,7 +2562,7 @@ obj2subsecx(VALUE obj, VALUE *subsecx)
return obj2ubits(obj, 6); /* vtm->sec */ return obj2ubits(obj, 6); /* vtm->sec */
} }
static long static VALUE
usec2subsecx(VALUE obj) usec2subsecx(VALUE obj)
{ {
if (RB_TYPE_P(obj, T_STRING)) { if (RB_TYPE_P(obj, T_STRING)) {

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2016-12-27" #define RUBY_RELEASE_DATE "2016-12-27"
#define RUBY_PATCHLEVEL 414 #define RUBY_PATCHLEVEL 415
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12