summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:21:12 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:21:12 (GMT)
commit6fe602ae32af4413529431ef1c1816b54453b92c (patch)
tree67b26548ec8783e4a254b6bc357c8b8deefd7ce9
parent65035f9fe9d30d88ee9ae9331014da2a3d229ed9 (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_6@16955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--object.c22
-rw-r--r--version.h2
2 files changed, 1 insertions, 23 deletions
diff --git a/object.c b/object.c
index 7064557..5b2a255 100644
--- a/object.c
+++ b/object.c
@@ -839,28 +839,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 5598739..e06387f 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 149
+#define RUBY_PATCHLEVEL 150
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8