summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
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/include@255
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@249
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@248
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@247
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@246
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@218
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@216
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@202
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@199
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@198
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@187
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@186
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@185
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@169
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@165
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@162
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@161
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@156
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@154
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@153
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@150
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@149
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
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/include@146
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Thu, 11 Mar 2010 20:23:07 +0000 (20:23 +0000)]
Removed experimental notification on iterators, and added experimental status for allocator (to be removed)
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@133
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Sun, 21 Feb 2010 14:08:17 +0000 (14:08 +0000)]
- added Int/UInt typedef in Json namespace. Modified Value::Int and Value::UInt to be typedef on those. Modified code to use Json::Int instead of Value::Int.
- added Value constructor taking begin/end pointer to initialize the Value with a non-zero terminated string.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@95
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Fri, 15 Jan 2010 14:56:59 +0000 (14:56 +0000)]
Integrated part of Patch #2839016, fixing default iterator initialization when using internal map.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@91
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Mon, 23 Nov 2009 22:33:30 +0000 (22:33 +0000)]
Fixed iteration bug over null values.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@88
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Sat, 21 Nov 2009 18:07:09 +0000 (18:07 +0000)]
- added mini unit testing framework
- added unit tests for Value.isXYZ() and iteration over Value members to compute size
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@85
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Wed, 18 Nov 2009 21:38:54 +0000 (21:38 +0000)]
- added Features class that describes allowed extension for Reader, to allow for strict configuration
- added tests from json.org jsonchecker and modified jsontestrunner to use strict parsing mode when executing them
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@76
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
malays [Fri, 13 Nov 2009 04:21:14 +0000 (04:21 +0000)]
Implementing support for reading and writing Unicode escape sequences.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@70
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Wed, 13 Jun 2007 17:02:59 +0000 (17:02 +0000)]
I always have compiler problems when using operator[](unsigned) when I pass int instead, so I added a note to the comments.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@51
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Wed, 13 Jun 2007 15:55:50 +0000 (15:55 +0000)]
Added StyledStreamWriter, which has no reason to derive from Writer, since its write() method does cannot return a string and must take a stream.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@49
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Wed, 13 Jun 2007 15:51:04 +0000 (15:51 +0000)]
Added prop svn:eol-style native. Stripped carriage-returns on unix. Hopefully, this will work for Windows too now.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@47
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Wed, 9 May 2007 19:35:15 +0000 (19:35 +0000)]
Fixed compilation warnings. Added -Wall to linux-gcc compilation. JSON_ASSERT_MESSAGE now throws exception (but JSON_ASSERT does not).
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@45
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Thu, 19 Apr 2007 22:20:46 +0000 (22:20 +0000)]
Added virtual destructor to StyledWriter to avoid -Wall warning from g++
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@44
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Fri, 23 Mar 2007 10:19:49 +0000 (10:19 +0000)]
Fixed 2.95.3 header probs
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@43
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Fri, 23 Mar 2007 09:57:01 +0000 (09:57 +0000)]
Added istream/ostream funcs/operators
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@42
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Fri, 23 Mar 2007 08:55:25 +0000 (08:55 +0000)]
Added empty() operator-bang and isNull()
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@40
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Fri, 23 Mar 2007 08:30:20 +0000 (08:30 +0000)]
Added removeMember() and altered a few comments.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@39
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Fri, 23 Mar 2007 07:28:19 +0000 (07:28 +0000)]
Added/clarified comments. Move extra verbiage out of brief sections.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@38
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Fri, 23 Mar 2007 07:05:19 +0000 (07:05 +0000)]
setComment() will assert if comment does not start with / (or if it were NULL, which would have seg-faulted before).
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@36
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
christopherdunn [Fri, 23 Mar 2007 06:38:29 +0000 (06:38 +0000)]
Added comments, pre- and post-condition for resize(), clear(), Value(ValueType).
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@35
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Sat, 17 Mar 2007 22:14:59 +0000 (22:14 +0000)]
- Made FastWriter output more compact.
- fixed bug in runjsontests.py script.
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@29
1f120ed1-78a5-a849-adca-
83f0a9e25bb6
blep [Thu, 15 Mar 2007 22:11:38 +0000 (22:11 +0000)]
- reorganized repository to match standard layout
git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@28
1f120ed1-78a5-a849-adca-
83f0a9e25bb6