forked from Floorp-Projects/Floorp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1280477 - Import jsoncpp into the source tree and integrate it in…
…to the build r=ted
- Loading branch information
1 parent
1222108
commit 7c92be6
Showing
25 changed files
with
7,782 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Baptiste Lepilleur <blep@users.sourceforge.net> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
a304d61a7b3ee2700b52abc0b28412aabee782e5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
The JsonCpp library's source code, including accompanying documentation, | ||
tests and demonstration applications, are licensed under the following | ||
conditions... | ||
|
||
The author (Baptiste Lepilleur) explicitly disclaims copyright in all | ||
jurisdictions which recognize such a disclaimer. In such jurisdictions, | ||
this software is released into the Public Domain. | ||
|
||
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of | ||
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is | ||
released under the terms of the MIT License (see below). | ||
|
||
In jurisdictions which recognize Public Domain property, the user of this | ||
software may choose to accept it either as 1) Public Domain, 2) under the | ||
conditions of the MIT License (see below), or 3) under the terms of dual | ||
Public Domain/MIT License conditions described here, as they choose. | ||
|
||
The MIT License is about as close to Public Domain as a license can get, and is | ||
described in clear, concise terms at: | ||
|
||
http://en.wikipedia.org/wiki/MIT_License | ||
|
||
The full text of the MIT License follows: | ||
|
||
======================================================================== | ||
Copyright (c) 2007-2010 Baptiste Lepilleur | ||
|
||
Permission is hereby granted, free of charge, to any person | ||
obtaining a copy of this software and associated documentation | ||
files (the "Software"), to deal in the Software without | ||
restriction, including without limitation the rights to use, copy, | ||
modify, merge, publish, distribute, sublicense, and/or sell copies | ||
of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be | ||
included in all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. | ||
======================================================================== | ||
(END LICENSE TEXT) | ||
|
||
The MIT license is compatible with both the GPL and commercial | ||
software, affording one all of the rights of Public Domain with the | ||
minor nuisance of being required to keep the above copyright notice | ||
and license text in the source code. Note also that by accepting the | ||
Public Domain "license" you can re-license your copy using whatever | ||
license you like. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,175 @@ | ||
New in SVN | ||
---------- | ||
|
||
* Updated the type system's behavior, in order to better support backwards | ||
compatibility with code that was written before 64-bit integer support was | ||
introduced. Here's how it works now: | ||
|
||
* isInt, isInt64, isUInt, and isUInt64 return true if and only if the | ||
value can be exactly represented as that type. In particular, a value | ||
constructed with a double like 17.0 will now return true for all of | ||
these methods. | ||
|
||
* isDouble and isFloat now return true for all numeric values, since all | ||
numeric values can be converted to a double or float without | ||
truncation. Note however that the conversion may not be exact -- for | ||
example, doubles cannot exactly represent all integers above 2^53 + 1. | ||
|
||
* isBool, isNull, isString, isArray, and isObject now return true if and | ||
only if the value is of that type. | ||
|
||
* isConvertibleTo(fooValue) indicates that it is safe to call asFoo. | ||
(For each type foo, isFoo always implies isConvertibleTo(fooValue).) | ||
asFoo returns an approximate or exact representation as appropriate. | ||
For example, a double value may be truncated when asInt is called. | ||
|
||
* For backwards compatibility with old code, isConvertibleTo(intValue) | ||
may return false even if type() == intValue. This is because the value | ||
may have been constructed with a 64-bit integer larger than maxInt, | ||
and calling asInt() would cause an exception. If you're writing new | ||
code, use isInt64 to find out whether the value is exactly | ||
representable using an Int64, or asDouble() combined with minInt64 and | ||
maxInt64 to figure out whether it is approximately representable. | ||
|
||
* Value | ||
- Patch #10: BOOST_FOREACH compatibility. Made Json::iterator more | ||
standard compliant, added missing iterator_category and value_type | ||
typedefs (contribued by Robert A. Iannucci). | ||
|
||
* Compilation | ||
|
||
- New CMake based build system. Based in part on contribution from | ||
Igor Okulist and Damien Buhl (Patch #14). | ||
|
||
- New header json/version.h now contains version number macros | ||
(JSONCPP_VERSION_MAJOR, JSONCPP_VERSION_MINOR, JSONCPP_VERSION_PATCH | ||
and JSONCPP_VERSION_HEXA). | ||
|
||
- Patch #11: added missing JSON_API on some classes causing link issues | ||
when building as a dynamic library on Windows | ||
(contributed by Francis Bolduc). | ||
|
||
- Visual Studio DLL: suppressed warning "C4251: <data member>: <type> | ||
needs to have dll-interface to be used by..." via pragma push/pop | ||
in json-cpp headers. | ||
|
||
- Added Travis CI intregration: https://travis-ci.org/blep/jsoncpp-mirror | ||
|
||
* Bug fixes | ||
- Patch #15: Copy constructor does not initialize allocated_ for stringValue | ||
(contributed by rmongia). | ||
|
||
- Patch #16: Missing field copy in Json::Value::iterator causing infinite | ||
loop when using experimental internal map (#define JSON_VALUE_USE_INTERNAL_MAP) | ||
(contributed by Ming-Lin Kao). | ||
|
||
|
||
New in JsonCpp 0.6.0: | ||
--------------------- | ||
|
||
* Compilation | ||
|
||
- LD_LIBRARY_PATH and LIBRARY_PATH environment variables are now | ||
propagated to the build environment as this is required for some | ||
compiler installation. | ||
|
||
- Added support for Microsoft Visual Studio 2008 (bug #2930462): | ||
The platform "msvc90" has been added. | ||
|
||
Notes: you need to setup the environment by running vcvars32.bat | ||
(e.g. MSVC 2008 command prompt in start menu) before running scons. | ||
|
||
- Added support for amalgamated source and header generation (a la sqlite). | ||
Refer to README.md section "Generating amalgamated source and header" | ||
for detail. | ||
|
||
* Value | ||
|
||
- Removed experimental ValueAllocator, it caused static | ||
initialization/destruction order issues (bug #2934500). | ||
The DefaultValueAllocator has been inlined in code. | ||
|
||
- Added support for 64 bits integer: | ||
|
||
Types Json::Int64 and Json::UInt64 have been added. They are aliased | ||
to 64 bits integers on system that support them (based on __int64 on | ||
Microsoft Visual Studio platform, and long long on other platforms). | ||
|
||
Types Json::LargestInt and Json::LargestUInt have been added. They are | ||
aliased to the largest integer type supported: | ||
either Json::Int/Json::UInt or Json::Int64/Json::UInt64 respectively. | ||
|
||
Json::Value::asInt() and Json::Value::asUInt() still returns plain | ||
"int" based types, but asserts if an attempt is made to retrieve | ||
a 64 bits value that can not represented as the return type. | ||
|
||
Json::Value::asInt64() and Json::Value::asUInt64() have been added | ||
to obtain the 64 bits integer value. | ||
|
||
Json::Value::asLargestInt() and Json::Value::asLargestUInt() returns | ||
the integer as a LargestInt/LargestUInt respectively. Those functions | ||
functions are typically used when implementing writer. | ||
|
||
The reader attempts to read number as 64 bits integer, and fall back | ||
to reading a double if the number is not in the range of 64 bits | ||
integer. | ||
|
||
Warning: Json::Value::asInt() and Json::Value::asUInt() now returns | ||
long long. This changes break code that was passing the return value | ||
to *printf() function. | ||
|
||
Support for 64 bits integer can be disabled by defining the macro | ||
JSON_NO_INT64 (uncomment it in json/config.h for example), though | ||
it should have no impact on existing usage. | ||
|
||
- The type Json::ArrayIndex is used for indexes of a JSON value array. It | ||
is an unsigned int (typically 32 bits). | ||
|
||
- Array index can be passed as int to operator[], allowing use of literal: | ||
Json::Value array; | ||
array.append( 1234 ); | ||
int value = array[0].asInt(); // did not compile previously | ||
|
||
- Added float Json::Value::asFloat() to obtain a floating point value as a | ||
float (avoid lost of precision warning caused by used of asDouble() | ||
to initialize a float). | ||
|
||
* Reader | ||
|
||
- Renamed Reader::getFormatedErrorMessages() to getFormattedErrorMessages. | ||
Bug #3023708 (Formatted has 2 't'). The old member function is deprecated | ||
but still present for backward compatibility. | ||
|
||
* Tests | ||
|
||
- Added test to ensure that the escape sequence "\/" is corrected handled | ||
by the parser. | ||
|
||
* Bug fixes | ||
|
||
- Bug #3139677: JSON [1 2 3] was incorrectly parsed as [1, 3]. Error is now | ||
correctly detected. | ||
|
||
- Bug #3139678: stack buffer overflow when parsing a double with a | ||
length of 32 characters. | ||
|
||
- Fixed Value::operator <= implementation (had the semantic of operator >=). | ||
Found when adding unit tests for comparison operators. | ||
|
||
- Value::compare() is now const and has an actual implementation with | ||
unit tests. | ||
|
||
- Bug #2407932: strpbrk() can fail for NULL pointer. | ||
|
||
- Bug #3306345: Fixed minor typo in Path::resolve(). | ||
|
||
- Bug #3314841/#3306896: errors in amalgamate.py | ||
|
||
- Fixed some Coverity warnings and line-endings. | ||
|
||
* License | ||
|
||
- See file LICENSE for details. Basically JsonCpp is now licensed under | ||
MIT license, or public domain if desired and recognized in your jurisdiction. | ||
Thanks to Stephan G. Beal [http://wanderinghorse.net/home/stephan/]) who | ||
helped figuring out the solution to the public domain issue. |
Oops, something went wrong.