aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-04-18 13:04:04 -0700
committerCarl Lerche <carllerche@mac.com>2010-04-18 13:04:04 -0700
commiteb83c9cf42aa208371643cdb10a2cbb8373e60ac (patch)
treeb75c0cdce2f9186b6935ec16897194c6d232ee59 /activesupport/lib
parentd32a4cbaa5174cc1a73d41a73f55145251c18c84 (diff)
parent978c80d6e347b060dc11ee666c8a3a61fc9408a4 (diff)
downloadrails-eb83c9cf42aa208371643cdb10a2cbb8373e60ac.tar.gz
rails-eb83c9cf42aa208371643cdb10a2cbb8373e60ac.tar.bz2
rails-eb83c9cf42aa208371643cdb10a2cbb8373e60ac.zip
Merge remote branch 'spastorino/master'
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/benchmark.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/activesupport/lib/active_support/core_ext/benchmark.rb b/activesupport/lib/active_support/core_ext/benchmark.rb
index ae57b152e8..2d110155a5 100644
--- a/activesupport/lib/active_support/core_ext/benchmark.rb
+++ b/activesupport/lib/active_support/core_ext/benchmark.rb
@@ -1,18 +1,6 @@
require 'benchmark'
class << Benchmark
- # Earlier Ruby had a slower implementation.
- if RUBY_VERSION < '1.8.7'
- remove_method :realtime
-
- def realtime
- r0 = Time.now
- yield
- r1 = Time.now
- r1.to_f - r0.to_f
- end
- end
-
def ms
1000 * realtime { yield }
end