summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 09:14:00 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 09:14:00 +0000
commite8508858a4eba91f50cffa6029580ebf6ddb1356 (patch)
treed895f04bbf310c39bf3c334481f1d1197c9e2084 /lib
parent27282c15d4c9e87e33351f0d424a8d83fea7fc1f (diff)
downloadruby-e8508858a4eba91f50cffa6029580ebf6ddb1356.tar.gz
ruby-e8508858a4eba91f50cffa6029580ebf6ddb1356.tar.xz
ruby-e8508858a4eba91f50cffa6029580ebf6ddb1356.zip
merges r23658 from trunk into ruby_1_9_1.
-- * lib/cmath.rb (log10): raised exception when the given number is a negative real. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/cmath.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cmath.rb b/lib/cmath.rb
index 95a30c336..1b0c65c99 100644
--- a/lib/cmath.rb
+++ b/lib/cmath.rb
@@ -48,7 +48,7 @@ module CMath
end
def log10(z)
- if z.real?
+ if z.real? and z >= 0
log10!(z)
else
log(z) / log!(10)