summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--enum.c6
-rw-r--r--version.h6
3 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index efaca159ae..108e4465cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 1 06:47:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enum.c (enum_grep): gets rid of type-punning calls.
+
Tue Jun 30 17:44:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (reg_match_pos): adjust offset based on characters, not
@@ -9,7 +13,7 @@ Tue Jun 30 17:44:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
Tue Jun 30 16:57:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * tool/rbinstall.rb: renamed to get rid of collision agains
+ * tool/rbinstall.rb: renamed to get rid of collision against
instruction.rb on command line completion of shell.
* tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
diff --git a/enum.c b/enum.c
index e63d04af4f..8205492e70 100644
--- a/enum.c
+++ b/enum.c
@@ -31,8 +31,9 @@ enum_values_pack(int argc, VALUE *argv)
#define enum_yield rb_yield_values2
static VALUE
-grep_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
{
+ VALUE *arg = (VALUE *)args;
ENUM_WANT_SVALUE();
if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
@@ -42,8 +43,9 @@ grep_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
}
static VALUE
-grep_iter_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
{
+ VALUE *arg = (VALUE *)args;
ENUM_WANT_SVALUE();
if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
diff --git a/version.h b/version.h
index fc1c2af72c..96524911d0 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-06-30"
+#define RUBY_RELEASE_DATE "2009-07-01"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -7,8 +7,8 @@
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 7
+#define RUBY_RELEASE_DAY 1
#include "ruby/version.h"