From d764be79b10ce488207ec4f3e82d2e4139b2d501 Mon Sep 17 00:00:00 2001 From: drbrain Date: Mon, 16 May 2011 18:34:41 +0000 Subject: [PATCH] * lib/timeout.rb (module Timeout): Hide internal constants. Patch by Pete Higgins. [Ruby 1.9 - Bug #4701] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/timeout.rb | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index a1f428f26c..b1b875152d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue May 17 03:33:21 2011 Eric Hodel + + * lib/timeout.rb (module Timeout): Hide internal constants. Patch by + Pete Higgins. [Ruby 1.9 - Bug #4701] + Mon May 16 11:21:09 2011 NAKAMURA Usaku * configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix diff --git a/lib/timeout.rb b/lib/timeout.rb index 297b76936c..f5b76783cd 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -29,8 +29,10 @@ module Timeout class ExitException < ::Exception # :nodoc: end + # :stopdoc: THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0 + # :startdoc: # Executes the method's block. If the block execution terminates before # +sec+ seconds has passed, it returns the result value of the block.