summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-13 15:49:38 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-13 15:49:38 +0000
commit4bb3fa6982a0b6c8fa68869e068041e1909bc39f (patch)
tree14878b75e3f14748969f4a1307f7c183737e47f8
parent1072cb65c996e672b23878839fac27c47d722f73 (diff)
* eval_method.c (rb_add_method): fix check for warning when
Object#initialize is redefined. (same as 1.8) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval_method.c6
-rw-r--r--version.h6
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f114e95..d5d05f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 7ff683d..4a3f560 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__) {
diff --git a/version.h b/version.h
index 4f7ca0d..0216f9f 100644
--- a/version.h
+++ b/version.h
@@ -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[];