From 8c7f9f5cdd0ade7442d4e341093ecf1b8e2f4690 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 11 May 2011 21:23:27 +0000 Subject: merges r30817 from trunk into ruby_1_9_2. -- * lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of Object#tap to restore STDOUT.sync. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/benchmark.rb | 3 ++- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0066c10447..bc122180cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 7 22:56:16 2011 CHIKANAGA Tomoyuki + + * lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of + Object#tap to restore STDOUT.sync. + Sun Feb 6 12:18:25 2011 Nobuyoshi Nakada * parse.y (words, qwords): dispatch array events. based on a diff --git a/lib/benchmark.rb b/lib/benchmark.rb index 8e7f778e2d..d06b434c65 100644 --- a/lib/benchmark.rb +++ b/lib/benchmark.rb @@ -281,8 +281,9 @@ module Benchmark list.push [label, res] } - STDOUT.sync = sync ary + ensure + STDOUT.sync = sync unless sync.nil? end # diff --git a/version.h b/version.h index d8eb2bb43b..8ca0761338 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 195 +#define RUBY_PATCHLEVEL 196 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3