external/jsoncpp.git
6 months agofix stdexcept master
christopherdunn [Tue, 13 May 2014 09:49:25 +0000 (09:49 +0000)]
fix stdexcept

https://sourceforge.net/p/jsoncpp/bugs/68/

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@283 1f120ed1-78a5-a849-adca-83f0a9e25bb6

7 months agoFixed a test that causes a crash when exceptions are disabled.
aaronjacobs [Wed, 23 Apr 2014 23:57:59 +0000 (23:57 +0000)]
Fixed a test that causes a crash when exceptions are disabled.

While I was at it, corrected whitespace too.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@282 1f120ed1-78a5-a849-adca-83f0a9e25bb6

7 months agoAdded structured error reporting to Reader.
aaronjacobs [Wed, 23 Apr 2014 23:41:12 +0000 (23:41 +0000)]
Added structured error reporting to Reader.

This allows applications for interactively viewing or editing JSON to do
a better job of highlighting errors. Also added offset accessors to
Value, offering the same sort of functionality even for non-errors.

Thanks to Zach Clifford (zacharyc@google.com) for the patch.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@281 1f120ed1-78a5-a849-adca-83f0a9e25bb6

7 months agoAdded features that allow the reader to accept common non-standard JSON.
aaronjacobs [Wed, 23 Apr 2014 23:28:23 +0000 (23:28 +0000)]
Added features that allow the reader to accept common non-standard JSON.

This is a version of patch #17, from Clay Wood:

    http://sourceforge.net/p/jsoncpp/patches/17/

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@280 1f120ed1-78a5-a849-adca-83f0a9e25bb6

7 months agovim modeline
christopherdunn [Sat, 19 Apr 2014 21:41:03 +0000 (21:41 +0000)]
vim modeline

http://vim.wikia.com/wiki/Modeline_magic

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@279 1f120ed1-78a5-a849-adca-83f0a9e25bb6

7 months agoComment reading/write improvements
christopherdunn [Sat, 19 Apr 2014 21:19:24 +0000 (21:19 +0000)]
Comment reading/write improvements

This patch fixes some aspects of reading and writing comments:
- Multiple C++-style comments before a Json value had extra newlines appended to them. This patch removes the addition of those newlines.
- Comments written before Json values in the StyledWriter were not indented to match the indentation level of the value. This patch adds indentation to comments.
- Fixed inconsistency in newlines following C- and C++-style comments being saved as part of the comment. All newlines at the end of a comment are now removed.
- Added an additional test of comments.

https://sourceforge.net/p/jsoncpp/patches/25/

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@278 1f120ed1-78a5-a849-adca-83f0a9e25bb6

7 months agoJSON_ASSERT -> JSON_ASSERT_MESSAGE
christopherdunn [Sat, 19 Apr 2014 06:37:23 +0000 (06:37 +0000)]
JSON_ASSERT -> JSON_ASSERT_MESSAGE

This way, assertions can produce exceptions.
https://sourceforge.net/p/jsoncpp/bugs/67/

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@277 1f120ed1-78a5-a849-adca-83f0a9e25bb6

9 months agoAdded missing includes for std::istream.
aaronjacobs [Wed, 29 Jan 2014 00:13:38 +0000 (00:13 +0000)]
Added missing includes for std::istream.

Thanks to Quentin Fiard for the report.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@276 1f120ed1-78a5-a849-adca-83f0a9e25bb6

14 months agoFixed broken build on VS 2012
blep [Mon, 23 Sep 2013 14:10:39 +0000 (14:10 +0000)]
Fixed broken build on VS 2012

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@275 1f120ed1-78a5-a849-adca-83f0a9e25bb6

15 months agoFixed some snprintf-related build breakages in Visual Studio.
aaronjacobs [Thu, 8 Aug 2013 23:08:28 +0000 (23:08 +0000)]
Fixed some snprintf-related build breakages in Visual Studio.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@274 1f120ed1-78a5-a849-adca-83f0a9e25bb6

15 months agoUpdated two calls to sprintf that I missed in r269.
aaronjacobs [Thu, 8 Aug 2013 00:39:32 +0000 (00:39 +0000)]
Updated two calls to sprintf that I missed in r269.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@273 1f120ed1-78a5-a849-adca-83f0a9e25bb6

15 months agoReplaced the complex implementation of valueToString(double).
aaronjacobs [Thu, 8 Aug 2013 00:39:12 +0000 (00:39 +0000)]
Replaced the complex implementation of valueToString(double).

The previous one was confusing and prone to buffer overflows, and didn't
work correctly with 16-decimal-digit numbers. The new one simply uses
snprintf with a standard format string.

The major change is that we don't always print a decimal point now.
Fortunately, JSON doesn't distinguish between integers and reals.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@272 1f120ed1-78a5-a849-adca-83f0a9e25bb6

15 months agoAdded more floating point tests.
aaronjacobs [Thu, 8 Aug 2013 00:37:39 +0000 (00:37 +0000)]
Added more floating point tests.

The first demonstrates a bug that I will soon fix.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@271 1f120ed1-78a5-a849-adca-83f0a9e25bb6

15 months agoAdded further floating point tests.
aaronjacobs [Thu, 8 Aug 2013 00:13:10 +0000 (00:13 +0000)]
Added further floating point tests.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@270 1f120ed1-78a5-a849-adca-83f0a9e25bb6

15 months agoSwitched away from sprintf, which is prone to buffer overflows.
aaronjacobs [Tue, 6 Aug 2013 23:12:56 +0000 (23:12 +0000)]
Switched away from sprintf, which is prone to buffer overflows.

Most reasonable platforms have this function. If you're here because
this broke the build for you, consider adding an ifdef for your platform
and using sprintf there (but not on other platforms).

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@269 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months ago- CMake: added option to turn fail compilation if warning occurs, and warning level...
blep [Thu, 9 May 2013 18:42:33 +0000 (18:42 +0000)]
- CMake: added option to turn fail compilation if warning occurs, and warning level 4 with MSVC.
- Fixed some warnings

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@268 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months ago- disabled warning 4786 for VS6 caused by STL (identifier was truncated to '255'...
blep [Thu, 9 May 2013 16:24:13 +0000 (16:24 +0000)]
- disabled warning 4786 for VS6 caused by STL (identifier was truncated to '255' characters in the debug information)
- added batchbuild config for XP VM

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@267 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoAdded simple batch build script for CMake.
blep [Thu, 9 May 2013 15:22:14 +0000 (15:22 +0000)]
Added simple batch build script for CMake.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@266 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoAdded missing source file to CMakeLists.txt.
blep [Thu, 9 May 2013 15:21:06 +0000 (15:21 +0000)]
Added missing source file to CMakeLists.txt.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@265 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agogit-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@264 1f120ed1...
blep [Thu, 9 May 2013 15:20:32 +0000 (15:20 +0000)]
git-svn-id: jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@264 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoFixed continuous integration matrix for debug/release build. Made static debug build...
blep [Wed, 8 May 2013 22:23:07 +0000 (22:23 +0000)]
Fixed continuous integration matrix for debug/release build. Made static debug build verbose.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@263 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoAdded continuous integration matrix for debug/release build. Made static debug build...
blep [Wed, 8 May 2013 22:15:15 +0000 (22:15 +0000)]
Added continuous integration matrix for debug/release build. Made static debug build verbose.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@262 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoAdded continuous integration matrix for shared/static library (specified through...
blep [Wed, 8 May 2013 22:04:57 +0000 (22:04 +0000)]
Added continuous integration matrix for shared/static library (specified through environment variables).

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@261 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoAdded continuous integration failure e-mail notification.
blep [Wed, 8 May 2013 21:23:52 +0000 (21:23 +0000)]
Added continuous integration failure e-mail notification.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@260 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoAdded clang compiler for continuous integration.
blep [Wed, 8 May 2013 21:04:42 +0000 (21:04 +0000)]
Added clang compiler for continuous integration.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@259 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoAdded basic Travis CI integration contributed by Igor Okulist.
blep [Wed, 8 May 2013 20:46:56 +0000 (20:46 +0000)]
Added basic Travis CI integration contributed by Igor Okulist.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@258 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months agoFixed CMake / Unix build instructions.
blep [Wed, 8 May 2013 20:37:54 +0000 (20:37 +0000)]
Fixed CMake / Unix build instructions.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@257 1f120ed1-78a5-a849-adca-83f0a9e25bb6

18 months ago- New CMake based build system. Based in part on contribution from
blep [Wed, 8 May 2013 20:21:11 +0000 (20:21 +0000)]
- New CMake based build system. Based in part on contribution from
Igor Okulist and Damien Buhl (Patch #14). Added support for running
tests and building with DLL on Windows.
- added missing JSON_API
- 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.
- New header json/version.h now contains version number macros
(JSONCPP_VERSION_MAJOR, JSONCPP_VERSION_MINOR, JSONCPP_VERSION_PATCH
and JSONCPP_VERSION_HEXA). While this header is generated by CMake,
it is committed to ease build with alternate build system
(CMake only update the file when it changes avoid issues with VCS).

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@256 1f120ed1-78a5-a849-adca-83f0a9e25bb6

19 months ago- Patch #3393345: BOOST_FOREACH compatibility. Made Json::iterator more standard...
blep [Fri, 12 Apr 2013 14:10:13 +0000 (14:10 +0000)]
- Patch #3393345: BOOST_FOREACH compatibility. Made Json::iterator more standard compliant, added missing iterator_category and value_type typedefs (contribued by Robert A. Iannucci).
- Patch #3474563: added missing JSON_API on some classes causing link issues when building as a dynamic library on Windows (contributed by Francis Bolduc).

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@255 1f120ed1-78a5-a849-adca-83f0a9e25bb6

19 months agoPatch #3600941: Missing field copy in Json::Value::iterator causing infinite loop...
blep [Fri, 12 Apr 2013 13:26:23 +0000 (13:26 +0000)]
Patch #3600941: 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).

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@254 1f120ed1-78a5-a849-adca-83f0a9e25bb6

19 months agoPatch #3539678: Copy constructor does not initialize allocated_ for stringValue ...
blep [Fri, 12 Apr 2013 13:11:14 +0000 (13:11 +0000)]
Patch #3539678: Copy constructor does not initialize allocated_ for stringValue (contributed by rmongia).

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@253 1f120ed1-78a5-a849-adca-83f0a9e25bb6

21 months agoFix gcc -Wall warnings (patch from Matt McCormick)
blep [Mon, 18 Feb 2013 15:53:47 +0000 (15:53 +0000)]
Fix gcc -Wall warnings (patch from Matt McCormick)

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@252 1f120ed1-78a5-a849-adca-83f0a9e25bb6

23 months agoFixed warning(error?) on #if testing value of _MSC_VER without checking that it was...
blep [Thu, 20 Dec 2012 10:08:50 +0000 (10:08 +0000)]
Fixed warning(error?) on #if testing value of _MSC_VER without checking that it was defined.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@251 1f120ed1-78a5-a849-adca-83f0a9e25bb6

2 years agoAdded missing "include/json/assertions.h" header in amalgamate.py.
blep [Fri, 27 Jul 2012 09:06:40 +0000 (09:06 +0000)]
Added missing "include/json/assertions.h" header in amalgamate.py.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@250 1f120ed1-78a5-a849-adca-83f0a9e25bb6

2 years agoMade it possible to drop null placeholders from array output. git-svn
aaronjacobs [Mon, 12 Mar 2012 04:53:57 +0000 (04:53 +0000)]
Made it possible to drop null placeholders from array output.

This can be used when it's clear that the consumer is able to deal with
this, as web browsers are. Thanks to Yatin Chawathe for the patch.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@249 1f120ed1-78a5-a849-adca-83f0a9e25bb6

2 years agoAdded an exit() to JSON_FAIL_MESSAGE to fix "no return" errors.
aaronjacobs [Sun, 8 Jan 2012 23:49:55 +0000 (23:49 +0000)]
Added an exit() to JSON_FAIL_MESSAGE to fix "no return" errors.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@248 1f120ed1-78a5-a849-adca-83f0a9e25bb6

2 years agoGot rid of several unnecessary includes of <iostream>.
aaronjacobs [Thu, 22 Dec 2011 03:18:24 +0000 (03:18 +0000)]
Got rid of several unnecessary includes of <iostream>.

Including <iostream> causes the file to be polluted with a static
initializer for the __ioinit symbol. This can harm binary startup time.
For more info, see here:

    http://neugierig.org/software/chromium/notes/2011/08/static-initializers.html

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@247 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoMade JSON_USE_EXCEPTION's value in config.h a default that can be overridden.
aaronjacobs [Wed, 14 Sep 2011 08:41:37 +0000 (08:41 +0000)]
Made JSON_USE_EXCEPTION's value in config.h a default that can be overridden.

This allows users to override it with their compiler invocation. For example:

    g++ -D JSON_USE_EXCEPTION=0 ...

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@246 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoUpdated bug-fix list.
christopherdunn [Fri, 24 Jun 2011 21:15:30 +0000 (21:15 +0000)]
Updated bug-fix list.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@245 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agobug#2407932: strpbrk() could fail for NULL pointer.
christopherdunn [Wed, 22 Jun 2011 21:04:41 +0000 (21:04 +0000)]
bug#2407932: strpbrk() could fail for NULL pointer.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@244 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agobug#3306345: minor typo in Path::resolve() -- missing bang.
christopherdunn [Wed, 22 Jun 2011 08:30:21 +0000 (08:30 +0000)]
bug#3306345: minor typo in Path::resolve() -- missing bang.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@243 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years ago(bug#3314841) Fixed JSON_IS_AMALGAMATION. Using os.path for OSX filename compatibility.
christopherdunn [Wed, 22 Jun 2011 00:43:31 +0000 (00:43 +0000)]
(bug#3314841) Fixed JSON_IS_AMALGAMATION. Using os.path for OSX filename compatibility.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@242 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoMore missing constructor initializers found by Coverity.
christopherdunn [Tue, 21 Jun 2011 23:02:06 +0000 (23:02 +0000)]
More missing constructor initializers found by Coverity.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@241 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAnother simple addition for constructor initialization, PathArgument.
christopherdunn [Tue, 21 Jun 2011 22:08:49 +0000 (22:08 +0000)]
Another simple addition for constructor initialization, PathArgument.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@240 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoSimple changes to Reader initialization, from Chromium folks. (I do not think this...
christopherdunn [Tue, 21 Jun 2011 21:56:54 +0000 (21:56 +0000)]
Simple changes to Reader initialization, from Chromium folks. (I do not think this was submitted as a bug.)

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@239 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoMore eol changes.
christopherdunn [Tue, 21 Jun 2011 21:53:02 +0000 (21:53 +0000)]
More eol changes.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@238 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoSwitched CRLF to LF in repo, and added svn:eol-style native. I might have missed...
christopherdunn [Tue, 21 Jun 2011 21:18:49 +0000 (21:18 +0000)]
Switched CRLF to LF in repo, and added svn:eol-style native. I might have missed a few files though. Just committing what I have so far.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@237 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoJust testing whether I can still commit changes. I cannot tell my access-level from...
christopherdunn [Tue, 21 Jun 2011 20:34:40 +0000 (20:34 +0000)]
Just testing whether I can still commit changes. I cannot tell my access-level from the sf project page.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@236 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed unit tests execution on MSVC 6 by removing usage of std::numeric_limits. It...
blep [Fri, 27 May 2011 08:12:41 +0000 (08:12 +0000)]
Fixed unit tests execution on MSVC 6 by removing usage of std::numeric_limits. It was returning 0 value in some max cases. Fixed Value::asFloat() to use integerToDouble().

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@235 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed compilation issues with MSVC 6: replace usage of ostringstream with valueToStri...
blep [Thu, 26 May 2011 22:55:24 +0000 (22:55 +0000)]
Fixed compilation issues with MSVC 6: replace usage of ostringstream with valueToString to support 64 bits integer and high precision floating point conversion to string. Replace usage of ULL and LL literal with UInt64(expr) and Int64(expr). Introduced helper function uint64ToDouble() to work-around missing conversion. Unit tests do not pass yet.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@234 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed MSVS 2003, 2005 and 2008 tests execution by normalizing floating-point string...
blep [Thu, 26 May 2011 20:14:32 +0000 (20:14 +0000)]
Fixed MSVS 2003, 2005 and 2008 tests execution by normalizing floating-point string representation using helper normalizeFloatingPointStr().

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@233 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed unit test failure on IBM AIX xlC by hard-coding the maxUInt64AsDouble as double...
blep [Thu, 26 May 2011 17:14:26 +0000 (17:14 +0000)]
Fixed unit test failure on IBM AIX xlC by hard-coding the maxUInt64AsDouble as double constant instead of relying on double(Value::maxUInt64) which produces an incorrect value.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@232 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years ago- Fixed unit test compilation on MSVS 2003, 2005 and 2008.
blep [Thu, 26 May 2011 07:32:36 +0000 (07:32 +0000)]
- Fixed unit test compilation on MSVS 2003, 2005 and 2008.
- Worked-around unit test failure with MSVS* by "forcing" all floating-point numbers to be loaded from memory instead of FPU registers.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@231 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed some test bugs that show up when 64-bit mode is disabled.
aaronjacobs [Thu, 26 May 2011 06:58:52 +0000 (06:58 +0000)]
Fixed some test bugs that show up when 64-bit mode is disabled.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@230 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAdded a few test cases that Google is using internally for patches made
aaronjacobs [Thu, 26 May 2011 06:58:14 +0000 (06:58 +0000)]
Added a few test cases that Google is using internally for patches made
in the past.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@229 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAnother round of attempting to fix VC++ errors...
aaronjacobs [Thu, 26 May 2011 03:44:02 +0000 (03:44 +0000)]
Another round of attempting to fix VC++ errors...

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@228 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed more default cases.
aaronjacobs [Thu, 26 May 2011 03:32:11 +0000 (03:32 +0000)]
Fixed more default cases.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@227 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoGot rid of some unreachable code.
aaronjacobs [Thu, 26 May 2011 03:27:44 +0000 (03:27 +0000)]
Got rid of some unreachable code.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@226 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a double -> float compilation warning/error.
aaronjacobs [Thu, 26 May 2011 03:04:01 +0000 (03:04 +0000)]
Fixed a double -> float compilation warning/error.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@225 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoReworked the type conversion system again, so that:A
aaronjacobs [Thu, 26 May 2011 02:46:28 +0000 (02:46 +0000)]
Reworked the type conversion system again, so that:A

 *  isFoo methods determine exact representability.
 *  asFoo methods cause casting when safe.
 *  isConvertibleTo indicates whether casting is safe.

See NEWS.txt for details.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@224 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoMade the unit test's output more readable, adding to jsontest's
aaronjacobs [Thu, 26 May 2011 00:30:39 +0000 (00:30 +0000)]
Made the unit test's output more readable, adding to jsontest's
capabilities (and simplifying its implementation) in the process.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@223 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoMade jsontest work with 64-bit integers, and fixed an error.
aaronjacobs [Thu, 26 May 2011 00:12:48 +0000 (00:12 +0000)]
Made jsontest work with 64-bit integers, and fixed an error.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@222 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoRemoved some out of date TODOs.
aaronjacobs [Wed, 25 May 2011 23:26:58 +0000 (23:26 +0000)]
Removed some out of date TODOs.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@221 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed test failures with 64-bit support disabled.
aaronjacobs [Wed, 25 May 2011 05:53:59 +0000 (05:53 +0000)]
Fixed test failures with 64-bit support disabled.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@220 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a 'comparison between signed and unsigned' error.
aaronjacobs [Wed, 25 May 2011 05:50:13 +0000 (05:50 +0000)]
Fixed a 'comparison between signed and unsigned' error.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@219 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAdded line breaks to make error messages easier to read.
aaronjacobs [Wed, 25 May 2011 04:59:57 +0000 (04:59 +0000)]
Added line breaks to make error messages easier to read.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@218 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a compilation warning/error.
aaronjacobs [Wed, 25 May 2011 04:34:57 +0000 (04:34 +0000)]
Fixed a compilation warning/error.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@217 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoGave a more consistent behavior to the Value::isFoo methods. See
aaronjacobs [Wed, 25 May 2011 04:19:17 +0000 (04:19 +0000)]
Gave a more consistent behavior to the Value::isFoo methods. See
NEWS.txt for more details.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@216 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed bugs in asInt64 and asUInt64.
aaronjacobs [Wed, 25 May 2011 03:16:49 +0000 (03:16 +0000)]
Fixed bugs in asInt64 and asUInt64.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@215 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAdded tests for default numeric values.
aaronjacobs [Wed, 25 May 2011 02:54:11 +0000 (02:54 +0000)]
Added tests for default numeric values.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@214 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a test bug.
aaronjacobs [Wed, 25 May 2011 01:51:30 +0000 (01:51 +0000)]
Fixed a test bug.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@213 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoMade tests more comprehensive.
aaronjacobs [Wed, 25 May 2011 01:46:50 +0000 (01:46 +0000)]
Made tests more comprehensive.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@212 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoGave tests more general names in preparation for making them much more
aaronjacobs [Wed, 25 May 2011 01:24:23 +0000 (01:24 +0000)]
Gave tests more general names in preparation for making them much more
comprehensive.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@211 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed some whitespace.
aaronjacobs [Wed, 25 May 2011 01:23:47 +0000 (01:23 +0000)]
Fixed some whitespace.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@210 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAdded tests for 64-bit integers.
aaronjacobs [Wed, 25 May 2011 01:23:08 +0000 (01:23 +0000)]
Added tests for 64-bit integers.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@209 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoGreatly fleshed out numeric type tests.
aaronjacobs [Wed, 25 May 2011 01:04:07 +0000 (01:04 +0000)]
Greatly fleshed out numeric type tests.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@208 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAdded some missing checks.
aaronjacobs [Wed, 25 May 2011 01:03:29 +0000 (01:03 +0000)]
Added some missing checks.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@207 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoRenamed test cases to make more sense with the upcoming new behavior of
aaronjacobs [Wed, 25 May 2011 00:39:55 +0000 (00:39 +0000)]
Renamed test cases to make more sense with the upcoming new behavior of
isFoo methods.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@206 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a whitespace problem.
aaronjacobs [Wed, 25 May 2011 00:39:17 +0000 (00:39 +0000)]
Fixed a whitespace problem.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@205 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a "comparison between signed and unsigned" warning/error.
aaronjacobs [Tue, 24 May 2011 23:08:59 +0000 (23:08 +0000)]
Fixed a "comparison between signed and unsigned" warning/error.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@204 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAdded a .gitignore file, for ease of use with git-svn.
aaronjacobs [Tue, 24 May 2011 23:05:56 +0000 (23:05 +0000)]
Added a .gitignore file, for ease of use with git-svn.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@203 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a missing include error.
aaronjacobs [Tue, 24 May 2011 06:27:36 +0000 (06:27 +0000)]
Fixed a missing include error.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@202 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a parsing bug in decodeNumber, updating the failing test cases to be
aaronjacobs [Tue, 24 May 2011 03:59:24 +0000 (03:59 +0000)]
Fixed a parsing bug in decodeNumber, updating the failing test cases to be
correct in the process. (The test cases incorrectly used exact integers instead
of scientific notation.)

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@201 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoAdded some test cases that catch a parsing bug.
aaronjacobs [Tue, 24 May 2011 03:19:50 +0000 (03:19 +0000)]
Added some test cases that catch a parsing bug.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@200 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a bunch of compilation errors when JSON_HAS_INT64 is set.
aaronjacobs [Tue, 24 May 2011 03:18:02 +0000 (03:18 +0000)]
Fixed a bunch of compilation errors when JSON_HAS_INT64 is set.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@199 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoCentralized assertion macros and made them obey JSON_USE_EXCEPTION.
aaronjacobs [Tue, 24 May 2011 01:03:22 +0000 (01:03 +0000)]
Centralized assertion macros and made them obey JSON_USE_EXCEPTION.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@198 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoMade two security fixes.
aaronjacobs [Tue, 24 May 2011 00:43:59 +0000 (00:43 +0000)]
Made two security fixes.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@197 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoUpdated a cast to use a more appropriate type.
aaronjacobs [Tue, 24 May 2011 00:43:30 +0000 (00:43 +0000)]
Updated a cast to use a more appropriate type.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@196 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed constructor initializer list order warnings/errors.
aaronjacobs [Tue, 24 May 2011 00:42:58 +0000 (00:42 +0000)]
Fixed constructor initializer list order warnings/errors.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@195 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoRemoved an unused typedef.
aaronjacobs [Tue, 24 May 2011 00:42:15 +0000 (00:42 +0000)]
Removed an unused typedef.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@194 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed a hard to debug crash on OS X related to sscanf format strings.
aaronjacobs [Tue, 24 May 2011 00:41:12 +0000 (00:41 +0000)]
Fixed a hard to debug crash on OS X related to sscanf format strings.

See here for more info:
    http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@193 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoReleased 0.6.0-rc2
blep [Mon, 2 May 2011 22:07:18 +0000 (22:07 +0000)]
Released 0.6.0-rc2

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@192 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoRelease 0.6.0-rc2
blep [Mon, 2 May 2011 21:30:42 +0000 (21:30 +0000)]
Release 0.6.0-rc2

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@188 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoFixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_IS_AMALGAMATION
blep [Mon, 2 May 2011 21:09:30 +0000 (21:09 +0000)]
Fixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_IS_AMALGAMATION

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@187 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoValue::compare() is now const and has an actual implementation with unit tests.
blep [Mon, 2 May 2011 20:11:48 +0000 (20:11 +0000)]
Value::compare() is now const and has an actual implementation with unit tests.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@186 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoUntabified some sources
blep [Mon, 2 May 2011 18:41:01 +0000 (18:41 +0000)]
Untabified some sources

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@185 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years ago- Added unit tests for comparison operators (except compare())
blep [Mon, 2 May 2011 16:53:10 +0000 (16:53 +0000)]
- Added unit tests for comparison operators (except compare())
- Fixed Value::operator <= implementation (had the semantic of operator >=). Found when addigin unit tests for comparison operators.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@184 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years ago- Bug #3200841: removed "warning C4127: conditional expression is constant" concernin...
blep [Mon, 2 May 2011 16:51:48 +0000 (16:51 +0000)]
- Bug #3200841: removed "warning C4127: conditional expression is constant" concerning infinite loop by replacing while (true) with for (;;). Added new JSON_FAIL macro. Commented unused parameters.

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@183 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoBug #3200841: removed "warning C4127: conditional expression is constant" concerning...
blep [Mon, 2 May 2011 09:54:49 +0000 (09:54 +0000)]
Bug #3200841: removed "warning C4127: conditional expression is constant" concerning infinite loop by replacing while (true) with for (;;).

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@182 1f120ed1-78a5-a849-adca-83f0a9e25bb6

3 years agoReleased 0.6.0-rc1
blep [Mon, 2 May 2011 07:30:45 +0000 (07:30 +0000)]
Released 0.6.0-rc1

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@181 1f120ed1-78a5-a849-adca-83f0a9e25bb6