summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--variable.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e019659025..9adafc8e82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 12 09:18:31 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * variable.c (uninitialized_constant): process through
+ rb_class_real() to remove "Object::" from error message.
+ [ruby-dev:40951]
+
Sat Jun 12 00:38:37 2010 Yusuke Endoh <mame@tsg.ne.jp>
* ext/dbm/extconf.rb: accept Berkley DB version 3, 4 and 5.
diff --git a/variable.c b/variable.c
index f27b73841b..382644b48a 100644
--- a/variable.c
+++ b/variable.c
@@ -1345,7 +1345,7 @@ NORETURN(static void uninitialized_constant(VALUE, ID));
static void
uninitialized_constant(VALUE klass, ID id)
{
- if (klass && klass != rb_cObject)
+ if (klass && rb_class_real(klass) != rb_cObject)
rb_name_error(id, "uninitialized constant %s::%s",
rb_class2name(klass),
rb_id2name(id));