From 3c0e4e61d68e20c239d1a8a25ca6e931ca1d802e Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Oct 2009 16:11:27 +0000 Subject: merges r24684 from trunk into ruby_1_9_1. -- * vm_method.c (rb_remove_method_id): exported. * numeric.c (num_sadded): fix for non-ascii method name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index 95d16bd548..a69c2101f6 100644 --- a/numeric.c +++ b/numeric.c @@ -202,13 +202,13 @@ rb_num_coerce_relop(VALUE x, VALUE y, ID func) static VALUE num_sadded(VALUE x, VALUE name) { - const char *nstr = rb_id2name(rb_to_id(name)); + ID mid = rb_to_id(name); /* ruby_frame = ruby_frame->prev; */ /* pop frame for "singleton_method_added" */ /* Numerics should be values; singleton_methods should not be added to them */ - rb_remove_method(rb_singleton_class(x), nstr); + rb_remove_method_id(rb_singleton_class(x), mid); rb_raise(rb_eTypeError, "can't define singleton method \"%s\" for %s", - nstr, + rb_id2name(mid), rb_obj_classname(x)); return Qnil; /* not reached */ } -- cgit v1.2.3