summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2016-06-07 18:02:09 +0200
committerFlorian Frank <flori@ping.de>2016-06-07 18:02:09 +0200
commite21126d495fd2d6d269bd65f4f0856a6ab6108fc (patch)
treedc169fea3e6b00a1dd594b19a24e69c250358204
parent00ce49d92bfce23a93bb52bc1ab9e9bf040a4493 (diff)
parent6327cbb815226cbdfe24b7ed41e015c6c1f2ac20 (diff)
downloadjson-e21126d495fd2d6d269bd65f4f0856a6ab6108fc.tar.gz
Merge branch 'master' into nobu-trunk
-rw-r--r--lib/json/add/date.rb1
-rw-r--r--lib/json/add/date_time.rb1
-rw-r--r--lib/json/add/exception.rb1
-rw-r--r--lib/json/add/ostruct.rb1
-rw-r--r--lib/json/add/range.rb1
-rw-r--r--lib/json/add/regexp.rb1
-rw-r--r--lib/json/add/struct.rb1
-rw-r--r--lib/json/add/symbol.rb1
-rw-r--r--lib/json/add/time.rb1
9 files changed, 0 insertions, 9 deletions
diff --git a/lib/json/add/date.rb b/lib/json/add/date.rb
index 6a9f16e..2552356 100644
--- a/lib/json/add/date.rb
+++ b/lib/json/add/date.rb
@@ -4,7 +4,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
end
require 'date'
-# Date serialization/deserialization
class Date
# Deserializes JSON string by converting Julian year <tt>y</tt>, month
diff --git a/lib/json/add/date_time.rb b/lib/json/add/date_time.rb
index 0edeeda..38b0e86 100644
--- a/lib/json/add/date_time.rb
+++ b/lib/json/add/date_time.rb
@@ -4,7 +4,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
end
require 'date'
-# DateTime serialization/deserialization
class DateTime
# Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
diff --git a/lib/json/add/exception.rb b/lib/json/add/exception.rb
index d6ecfed..a107e5b 100644
--- a/lib/json/add/exception.rb
+++ b/lib/json/add/exception.rb
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
require 'json'
end
-# Exception serialization/deserialization
class Exception
# Deserializes JSON string by constructing new Exception object with message
diff --git a/lib/json/add/ostruct.rb b/lib/json/add/ostruct.rb
index b8bf8ed..7c13910 100644
--- a/lib/json/add/ostruct.rb
+++ b/lib/json/add/ostruct.rb
@@ -4,7 +4,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
end
require 'ostruct'
-# OpenStruct serialization/deserialization
class OpenStruct
# Deserializes JSON string by constructing new Struct object with values
diff --git a/lib/json/add/range.rb b/lib/json/add/range.rb
index d9c97dd..93529fb 100644
--- a/lib/json/add/range.rb
+++ b/lib/json/add/range.rb
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
require 'json'
end
-# Range serialization/deserialization
class Range
# Deserializes JSON string by constructing new Range object with arguments
diff --git a/lib/json/add/regexp.rb b/lib/json/add/regexp.rb
index df945ba..a93866b 100644
--- a/lib/json/add/regexp.rb
+++ b/lib/json/add/regexp.rb
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
require 'json'
end
-# Regexp serialization/deserialization
class Regexp
# Deserializes JSON string by constructing new Regexp object with source
diff --git a/lib/json/add/struct.rb b/lib/json/add/struct.rb
index 2180207..e8395ed 100644
--- a/lib/json/add/struct.rb
+++ b/lib/json/add/struct.rb
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
require 'json'
end
-# Struct serialization/deserialization
class Struct
# Deserializes JSON string by constructing new Struct object with values
diff --git a/lib/json/add/symbol.rb b/lib/json/add/symbol.rb
index 1f07bf7..74b13a4 100644
--- a/lib/json/add/symbol.rb
+++ b/lib/json/add/symbol.rb
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
require 'json'
end
-# Symbol serialization/deserialization
class Symbol
# Returns a hash, that will be turned into a JSON object and represent this
# object.
diff --git a/lib/json/add/time.rb b/lib/json/add/time.rb
index d0cb97d..b73acc4 100644
--- a/lib/json/add/time.rb
+++ b/lib/json/add/time.rb
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
require 'json'
end
-# Time serialization/deserialization
class Time
# Deserializes JSON string by converting time since epoch to Time