From 29bee7e8ea26e9540b61add2c774860f4c61d4ff Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 3 Jun 2014 09:13:39 +0000 Subject: [PATCH] revert r46332 because RVALUE_OLD_P() returns int by r46334 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ------ gc.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb6811d780..8f40a713a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,12 +27,6 @@ Tue Jun 3 16:38:19 2014 Koichi Sasada * gc.c (gc_after_sweep): do gc_verify_internal_consistency() when RGENGC_CHECK_MODE >= 2. -Tue Jun 3 16:33:27 2014 Koichi Sasada - - * gc.c (rb_gc_force_recycle): we only need to know the result (0/1) - of RVALUE_OLD_P(). clang fails to compile it because is_old is - `int' but RVALUE_OLD_P() returns VALUE. - Tue Jun 3 13:14:04 2014 Shugo Maeda * lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body diff --git a/gc.c b/gc.c index 728bf55ba1..82c6eadf2a 100644 --- a/gc.c +++ b/gc.c @@ -5033,7 +5033,7 @@ rb_gc_force_recycle(VALUE p) rb_objspace_t *objspace = &rb_objspace; #if USE_RGENGC - int is_old = RVALUE_OLD_P(p) != 0; + int is_old = RVALUE_OLD_P(p); if (is_old) { objspace->rgengc.old_object_count--;