git.chromium.org Git - external/jsoncpp/jsoncpp.git/log

projects / external / jsoncpp / jsoncpp.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

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/jsoncpp@255 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@254 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@253 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@252 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@251 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@250 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@249 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@248 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@247 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@246 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@245 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@244 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@243 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@242 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@241 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@240 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@239 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@238 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@237 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@236 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@235 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@234 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@233 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@232 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@231 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@230 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@229 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@228 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@227 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@226 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@225 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@224 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@223 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@222 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@221 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@220 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@219 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@218 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@217 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@216 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@215 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@214 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@213 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@212 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@211 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@210 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@209 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@208 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@207 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@206 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@205 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@204 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@203 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@202 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@201 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@200 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@199 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@198 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@197 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@196 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@195 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@194 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@193 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@192 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@188 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@187 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@186 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@185 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@184 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@183 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@182 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

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/jsoncpp@181 1f120ed1-78a5-a849-adca-83f0a9e25bb6

commit | commitdiff | tree

blep [Mon, 2 May 2011 07:06:33 +0000 (07:06 +0000)]

Need more tests on unicode

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

commit | commitdiff | tree

blep [Mon, 2 May 2011 07:06:07 +0000 (07:06 +0000)]

Added support for amalgated source and header generation (a la sqlite). Refer to README.txt section "Generating amalgated source and header" for detail.

The amalgated sources are generated by concatenating JsonCpp source in the correct order and defining macro JSON_IS_AMALGATED to prevent inclusion of other headers. Sources and header has been modified to prevent any inclusion when this macro is defined.

The script amalgate.py handle the generation.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 22:11:05 +0000 (22:11 +0000)]

Release 0.6.0-rc1

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 20:50:44 +0000 (20:50 +0000)]

Release test-0.6.0

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 20:36:55 +0000 (20:36 +0000)]

Release test-0.6.0

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 20:13:40 +0000 (20:13 +0000)]

Added support for amalgated source and header generation (a la sqlite). Refer to README.txt section "Generating amalgated source and header" for detail.

The amalgated sources are generated by concatenating JsonCpp source in the correct order and defining macro JSON_IS_AMALGATED to prevent inclusion of other headers. Sources and header has been modified to prevent any inclusion when this macro is defined.

The script amalgate.py handle the generation.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 18:33:46 +0000 (18:33 +0000)]

Added project URL.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 17:24:16 +0000 (17:24 +0000)]

Added recommended include path.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 16:42:18 +0000 (16:42 +0000)]

Added known bug reference for experimental internal map.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 16:27:55 +0000 (16:27 +0000)]

Renamed Reader::getFormatedErrorMessages() to getFormattedErrorMessages. Bug #3023708 (Formatted has 2 't'). The old member function is deprecated but still present for backward compatibility.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 15:47:38 +0000 (15:47 +0000)]

Fixed bug #3139678: stack buffer overflow when parsing a double with a length of 32 characters.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 15:40:47 +0000 (15:40 +0000)]

Fixed bug #3139677: JSON [1 2 3] was incorrectly parsed as [1, 3]. Error is now correctly detected.

Modified runjsontests.py to allow test that expect failure in jsoncpp test suite.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 15:09:16 +0000 (15:09 +0000)]

Fixed latest readme.txt url.

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

commit | commitdiff | tree

blep [Sun, 1 May 2011 15:06:40 +0000 (15:06 +0000)]

Fixed url for scons 1.2 download. Clarify manual test run executable path.

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

commit | commitdiff | tree

blep [Mon, 27 Dec 2010 17:45:23 +0000 (17:45 +0000)]

Major rework of 64 integer support: 64 bits integer are only returned when explicitly request via Json::Value::asInt64(), unlike previous implementation where Json::Value::asInt() returned a 64 bits integer.

This eases porting portable code and does not break compatibility with the previous release.

Json::Value::asLargestInt() has also be added to ease writing portable code independent of 64 bits integer support. It is typically used to implement writers.

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

commit | commitdiff | tree

blep [Fri, 24 Dec 2010 19:58:23 +0000 (19:58 +0000)]

Fixed some documentation issues pointed out by Daniel.

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

commit | commitdiff | tree

blep [Fri, 24 Dec 2010 19:30:06 +0000 (19:30 +0000)]

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).

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

commit | commitdiff | tree

blep [Fri, 24 Dec 2010 12:47:14 +0000 (12:47 +0000)]

- 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

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

commit | commitdiff | tree

blep [Tue, 27 Apr 2010 16:38:30 +0000 (16:38 +0000)]

updated license with clearer information

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

commit | commitdiff | tree

blep [Tue, 27 Apr 2010 16:37:50 +0000 (16:37 +0000)]

- added unit test and roadmap for handling of escape sequence "\/"

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

commit | commitdiff | tree

blep [Tue, 20 Apr 2010 21:35:19 +0000 (21:35 +0000)]

JsonCpp is now licensed under MIT license, or public domain if desired and recognized in your jurisdiction.

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

commit | commitdiff | tree

blep [Mon, 19 Apr 2010 07:37:41 +0000 (07:37 +0000)]

- Moved definition of Json::Int and Json::UInt to config.h which compiler detection logic to define them to 64 bits integer if JSON_NO_INT64 is not defined.
- Added Json::ArrayIndex as an unsigned int to forwards.h
- Modified Json::Value to consistently use Json::ArrayIndex.
- Added int/unsigned int constructor overload to Json::Value to avoid ambiguous constructor call.
- Modified jsontestrunner/main.cpp to use Json::valueToString for Value::asInt() conversion to string.
- Modified Json::Reader to only overflow to double when the number is too large (previous code relied on the fact that an int fitted in a double without precision loss).
- Generalized uintToString() helpers and buffer size to automatically adapt to the precision of Json::UInt.
- Added specific conversion logic for UInt to double conversion on Microsoft Visual Studio 6 which only support __int64 to double conversion (unsigned __int64 conversion is not supported)
- Added test for 64 bits parsing/writing. Notes: those will fail when compiled with JSON_NO_INT64 (more dev required to adapt).

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

commit | commitdiff | tree

blep [Wed, 14 Apr 2010 13:17:26 +0000 (13:17 +0000)]

- added need for 64 bits integer to roadmap

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

commit | commitdiff | tree

blep [Sat, 13 Mar 2010 13:10:27 +0000 (13:10 +0000)]

Removed experimental ValueAllocator, it caused static initialization/destruction order issues (bug #2934500). The DefaultValueAllocator has been inlined in code.

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

commit | commitdiff | tree

blep [Sat, 13 Mar 2010 12:24:38 +0000 (12:24 +0000)]

- extracted some utility functions out-of reader and parser.

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

commit | commitdiff | tree

blep [Sat, 13 Mar 2010 11:14:49 +0000 (11:14 +0000)]

Added NEWS.txt that provides a synopsis of the change since the last version. Integrated NEWS.txt in documentation.

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

commit | commitdiff | tree

blep [Sat, 13 Mar 2010 10:59:50 +0000 (10:59 +0000)]

- added support for compilation using Microsoft Visual Studio 2008

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

commit | commitdiff | tree

blep [Sat, 13 Mar 2010 07:59:07 +0000 (07:59 +0000)]

- better execution examples

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

git clone http://git.chromium.org/external/jsoncpp/jsoncpp.git