diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 21:00:39 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 21:00:39 +0000 |
commit | f77e42ad2d01d52d088eb3001af651ec24132357 (patch) | |
tree | 828fea9928adb654f9c865d829e4ff5c4094fdc0 | |
parent | a2d87271fca38bd4048a5f1adb74ec70a93c02bf (diff) |
merge revision(s) 14465:
* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
the issue. [ruby-dev:32677]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/date.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Jun 8 05:59:36 2008 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date.rb: don't freeze nil even if 1.8 will not be aware of + the issue. [ruby-dev:32677] + Sun Jun 8 05:54:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (TIMEZONE_VOID): check whether timezone requires zero diff --git a/lib/date.rb b/lib/date.rb index 6da4d6aa8e..10d8c94ae3 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -6,7 +6,7 @@ # Documentation: William Webber <william@williamwebber.com> # #-- -# $Id: date.rb,v 2.30 2006-12-30 21:43:41+09 tadf Exp $ +# $Id: date.rb,v 2.33 2007-12-22 14:41:34+09 tadf Exp $ #++ # # == Overview @@ -250,7 +250,7 @@ class Date ABBR_DAYNAMES = %w(Sun Mon Tue Wed Thu Fri Sat) [MONTHNAMES, DAYNAMES, ABBR_MONTHNAMES, ABBR_DAYNAMES].each do |xs| - xs.each{|x| x.freeze}.freeze + xs.each{|x| x.freeze unless x.nil?}.freeze end class Infinity < Numeric # :nodoc: @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 162 +#define RUBY_PATCHLEVEL 163 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |