summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:20:14 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:20:14 +0000
commit01dabde0e80631e1d9d713345688bd13c2544c55 (patch)
treedd8df6c4ee136dc16bcc14373523df56a364b404
parentc223c92afdfeb8049b97e687533767c8177b4811 (diff)
merge revision(s) 13989:
* object.c (nil_plus): remove unused function. [ruby-core:13737] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--object.c22
-rw-r--r--version.h2
3 files changed, 5 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d038c3bf59..428de35e41f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 8 04:18:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * object.c (nil_plus): remove unused function. [ruby-core:13737]
+
Sun Jun 8 04:15:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_alias): do not call hook functions until initialization
diff --git a/object.c b/object.c
index 787b860d5d0..18407cc02ec 100644
--- a/object.c
+++ b/object.c
@@ -812,28 +812,6 @@ nil_inspect(obj)
return rb_str_new2("nil");
}
-#ifdef NIL_PLUS
-static VALUE
-nil_plus(x, y)
- VALUE x, 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(rb_inspect(y))->ptr,
- rb_obj_classname(y));
- }
- /* not reached */
-}
-#endif
-
static VALUE
main_to_s(obj)
VALUE obj;
diff --git a/version.h b/version.h
index 912605ca27b..02b43a5bd14 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 150
+#define RUBY_PATCHLEVEL 151
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8