summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2009-09-02 11:37:41 +0200
committerFlorian Frank <flori@ping.de>2009-09-02 11:37:41 +0200
commit4f96cfe8617a4cb603b9df11c5b09dc35ce3d787 (patch)
tree084837f19dd260dccac8f210ba90e091e9ea5e5c
parentbc1204c29fed26ecc332e72e9f79f5037a11b1e0 (diff)
parent7f839af3348e65a37353279ee9e96f8af922d272 (diff)
downloadjson-4f96cfe8617a4cb603b9df11c5b09dc35ce3d787.tar.gz
Merge branch 'master' of git@github.com:/flori/json
-rw-r--r--lib/json/common.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/json/common.rb b/lib/json/common.rb
index 61548eb..467c7b2 100644
--- a/lib/json/common.rb
+++ b/lib/json/common.rb
@@ -74,7 +74,7 @@ module JSON
end
self.create_id = 'json_class'
- NaN = (-1.0) ** 0.5
+ NaN = 0.0/0
Infinity = 1.0/0
@@ -270,7 +270,6 @@ module JSON
proc.call result
end
end
- private :recurse_proc
module_function :recurse_proc
alias restore load