summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--hash.c18
-rw-r--r--version.h6
3 files changed, 15 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index dfa87a3737..2d3aa40e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jun 23 00:37:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * hash.c (rb_hash_select): remove unnecessary varargs for
+ rb_hash_select. a patch from Daniel Berger
+ <Daniel.Berger at qwest.com>. [ruby-core:11527]
+
+ * hash.c: ditto.
+
Mon Jun 18 08:47:54 2007 Technorama Ltd. <oss-ruby@technorama.net>
* ext/openssl/{extconf.rb,ossl_ssl_session.c}:
Fix ruby-Bugs-11513.
diff --git a/hash.c b/hash.c
index e2f7345f5a..e943b0fd91 100644
--- a/hash.c
+++ b/hash.c
@@ -853,16 +853,11 @@ rb_hash_values_at(argc, argv, hash)
*/
VALUE
-rb_hash_select(argc, argv, hash)
- int argc;
- VALUE *argv;
+rb_hash_select(hash)
VALUE hash;
{
VALUE result;
- if (argc > 0) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
- }
result = rb_ary_new();
rb_hash_foreach(hash, select_i, result);
return result;
@@ -2082,16 +2077,11 @@ env_values_at(argc, argv)
}
static VALUE
-env_select(argc, argv)
- int argc;
- VALUE *argv;
+env_select()
{
VALUE result;
char **env;
- if (argc > 0) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
- }
result = rb_ary_new();
env = GET_ENVIRON(environ);
while (*env) {
@@ -2499,7 +2489,7 @@ Init_Hash()
rb_define_method(rb_cHash,"shift", rb_hash_shift, 0);
rb_define_method(rb_cHash,"delete", rb_hash_delete, 1);
rb_define_method(rb_cHash,"delete_if", rb_hash_delete_if, 0);
- rb_define_method(rb_cHash,"select", rb_hash_select, -1);
+ rb_define_method(rb_cHash,"select", rb_hash_select, 0);
rb_define_method(rb_cHash,"reject", rb_hash_reject, 0);
rb_define_method(rb_cHash,"reject!", rb_hash_reject_bang, 0);
rb_define_method(rb_cHash,"clear", rb_hash_clear, 0);
@@ -2534,7 +2524,7 @@ Init_Hash()
rb_define_singleton_method(envtbl,"clear", env_clear, 0);
rb_define_singleton_method(envtbl,"reject", env_reject, 0);
rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
- rb_define_singleton_method(envtbl,"select", env_select, -1);
+ rb_define_singleton_method(envtbl,"select", env_select, 0);
rb_define_singleton_method(envtbl,"shift", env_shift, 0);
rb_define_singleton_method(envtbl,"invert", env_invert, 0);
rb_define_singleton_method(envtbl,"replace", env_replace, 1);
diff --git a/version.h b/version.h
index e917bb8133..c8a1aa25b6 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-06-18"
+#define RUBY_RELEASE_DATE "2007-06-23"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070618
+#define RUBY_RELEASE_CODE 20070623
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 23
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];