summaryrefslogtreecommitdiffhomepage
path: root/src/class.c
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-02-18 09:13:52 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-02-18 09:13:52 +0900
commit3a78093b45c176baae7b13d47ed08e135aad1123 (patch)
tree40e87b7d48c09d3386c762487c3124d5f4600205 /src/class.c
parent5568df5efee7a7220008227ea622121320c2b49b (diff)
downloadmruby-3a78093b45c176baae7b13d47ed08e135aad1123.tar.gz
mruby-3a78093b45c176baae7b13d47ed08e135aad1123.zip
resolve conflict
Diffstat (limited to 'src/class.c')
-rw-r--r--src/class.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/class.c b/src/class.c
index 7d99da56a..e70bd7e73 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1737,7 +1737,7 @@ mrb_mod_remove_const(mrb_state *mrb, mrb_value mod)
check_const_name(mrb, id);
val = mrb_iv_remove(mrb, mod, id);
if (mrb_undef_p(val)) {
- mrb_name_error(mrb, sym, "constant %s not defined", mrb_sym2name(mrb, sym));
+ mrb_name_error(mrb, id, "constant %s not defined", mrb_sym2name(mrb, id));
}
return val;
}