summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:21:12 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:21:12 +0000
commit6fe602ae32af4413529431ef1c1816b54453b92c (patch)
tree67b26548ec8783e4a254b6bc357c8b8deefd7ce9 /object.c
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
Diffstat (limited to 'object.c')
-rw-r--r--object.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/object.c b/object.c
index 706455713c..5b2a255d0c 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;