diff --git a/ChangeLog b/ChangeLog index c4725b4650..e47b64e20b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 4 08:50:10 2010 Nobuyoshi Nakada + + * ext/iconv/iconv.c (Init_iconv): no warnings if $VERBOSE is nil. + Sat Dec 4 08:25:15 2010 Nobuyoshi Nakada * vm_insnhelper.c (vm_call_method): revert r30064 and r30071, diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 83a4b5e299..531745c38d 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -1208,7 +1208,9 @@ Init_iconv(void) { VALUE rb_cIconv = rb_define_class("Iconv", rb_cData); - warn_deprecated(); + if (!NIL_P(ruby_verbose)) { + warn_deprecated(); + } rb_define_alloc_func(rb_cIconv, iconv_s_allocate); rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, -1); rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);