* time.c (time_succ): Time#succ should return a time object in the

shyouhei · shyouhei · commit f25a57b3ef00 · 2007-08-22T01:28:12.000Z
same timezone mode to the original.  [ruby-talk:260256]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 10:26:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_succ): Time#succ should return a time object in the
+	  same timezone mode to the original.  [ruby-talk:260256]
+
 Wed Aug 22 10:24:00 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (fix_pow): integer power calculation: 0**n => 0, 
diff --git a/time.c b/time.c
@@ -1397,9 +1397,14 @@ time_succ(time)
     VALUE time;
 {
     struct time_object *tobj;
+    int gmt;
 
     GetTimeval(time, tobj);
-    return rb_time_new(tobj->tv.tv_sec + 1, tobj->tv.tv_usec);
+    gmt = tobj->gmt;
+    time = rb_time_new(tobj->tv.tv_sec + 1, tobj->tv.tv_usec);
+    GetTimeval(time, tobj);
+    tobj->gmt = gmt;
+    return time;
 }
 
 /*
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 68
+#define RUBY_PATCHLEVEL 69
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -1397,9 +1397,14 @@ time_succ(time)`
`1397`	`1397`	`VALUE time;`
`1398`	`1398`	`{`
`1399`	`1399`	`struct time_object *tobj;`
	`1400`	`+ int gmt;`
`1400`	`1401`
`1401`	`1402`	`GetTimeval(time, tobj);`
`1402`		`- return rb_time_new(tobj->tv.tv_sec + 1, tobj->tv.tv_usec);`
	`1403`	`+ gmt = tobj->gmt;`
	`1404`	`+ time = rb_time_new(tobj->tv.tv_sec + 1, tobj->tv.tv_usec);`
	`1405`	`+ GetTimeval(time, tobj);`
	`1406`	`+ tobj->gmt = gmt;`
	`1407`	`+ return time;`
`1403`	`1408`	`}`
`1404`	`1409`
`1405`	`1410`	`/*`