diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval_method.c | 6 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed May 14 00:45:58 2008 Yusuke Endoh <mame@tsg.ne.jp> + + * eval_method.c (rb_add_method): fix check for warning when + Object#initialize is redefined. (same as 1.8) + Tue May 13 23:32:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * enum.c (enum_yield): use rb_yield_values2. diff --git a/eval_method.c b/eval_method.c index 7ff683d219..4a3f560939 100644 --- a/eval_method.c +++ b/eval_method.c @@ -153,9 +153,9 @@ rb_add_method(VALUE klass, ID mid, NODE * node, int noex) rb_warning("method redefined; discarding old %s", rb_id2name(mid)); } } - if (klass == rb_cObject && node && node->nd_mid == init) { - rb_warn("redefining Object#initialize may cause infinite loop"); - } + } + if (klass == rb_cObject && node && mid == init) { + rb_warn("redefining Object#initialize may cause infinite loop"); } if (mid == object_id || mid == __send__) { @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-05-13" +#define RUBY_RELEASE_DATE "2008-05-14" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080513 +#define RUBY_RELEASE_CODE 20080514 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |