From 82bdcbda7ed191bb9f042d496c70516a85e5e420 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 20 Nov 2007 16:16:53 +0000 Subject: * object.c (nil_plus): remove unused function. [ruby-core:13737] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ object.c | 21 --------------------- version.h | 6 +++--- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b2e3029f..ff63a59f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 21 01:04:12 2007 Yukihiro Matsumoto + + * object.c (nil_plus): remove unused function. [ruby-core:13737] + Tue Nov 20 21:46:46 2007 Tanaka Akira * time.c (time_mload): ignore invalid digits in submicro. diff --git a/object.c b/object.c index 0ecb408ba..d0f104cae 100644 --- a/object.c +++ b/object.c @@ -811,27 +811,6 @@ nil_inspect(VALUE obj) return rb_str_new2("nil"); } -#ifdef NIL_PLUS -static VALUE -nil_plus(VALUE x, VALUE y) -{ - switch (TYPE(y)) { - case T_NIL: - case T_FIXNUM: - case T_FLOAT: - case T_BIGNUM: - case T_STRING: - case T_ARRAY: - return y; - default: - rb_raise(rb_eTypeError, "tried to add %s(%s) to nil", - RSTRING_PTR(rb_inspect(y)), - rb_obj_classname(y)); - } - /* not reached */ -} -#endif - /*********************************************************************** * Document-class: TrueClass * diff --git a/version.h b/version.h index fd2f91e7f..25decee31 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-11-20" +#define RUBY_RELEASE_DATE "2007-11-21" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071120 +#define RUBY_RELEASE_CODE 20071121 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit