Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Merged master with latest upstream changes. #3

Merged
merged 82 commits into from

2 participants

@rjeczalik

Merged master with latest upstream changes.

blep and others added some commits
blep Fixed url for scons 1.2 download. Clarify manual test run executable …
…path.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@157 1f120ed1-78a5-a849-adca-83f0a9e25bb6
f1f22c9
blep Fixed latest readme.txt url.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@158 1f120ed1-78a5-a849-adca-83f0a9e25bb6
3a3f7ed
blep Fixed bug #3139677: JSON [1 2 3] was incorrectly parsed as [1, 3]. Er…
…ror is now correctly detected.

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

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@159 1f120ed1-78a5-a849-adca-83f0a9e25bb6
9ecfc6f
blep Fixed bug #3139678: stack buffer overflow when parsing a double with …
…a length of 32 characters.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@160 1f120ed1-78a5-a849-adca-83f0a9e25bb6
79b9b0b
blep Renamed Reader::getFormatedErrorMessages() to getFormattedErrorMessag…
…es. Bug #3023708 (Formatted has 2 't'). The old member function is deprecated but still present for backward compatibility.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@161 1f120ed1-78a5-a849-adca-83f0a9e25bb6
9ad2ebb
blep Added known bug reference for experimental internal map.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@162 1f120ed1-78a5-a849-adca-83f0a9e25bb6
700147d
blep Added recommended include path.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@163 1f120ed1-78a5-a849-adca-83f0a9e25bb6
fe6fd5f
blep Added project URL.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@164 1f120ed1-78a5-a849-adca-83f0a9e25bb6
399df78
blep 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@165 1f120ed1-78a5-a849-adca-83f0a9e25bb6
900c969
blep Release test-0.6.0
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@166 1f120ed1-78a5-a849-adca-83f0a9e25bb6
5be9af0
blep Release test-0.6.0
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@169 1f120ed1-78a5-a849-adca-83f0a9e25bb6
063521c
blep Release 0.6.0-rc1
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@173 1f120ed1-78a5-a849-adca-83f0a9e25bb6
d9dea53
blep 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@177 1f120ed1-78a5-a849-adca-83f0a9e25bb6
be1e47a
blep Need more tests on unicode
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@178 1f120ed1-78a5-a849-adca-83f0a9e25bb6
6c6ccac
blep Released 0.6.0-rc1
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@181 1f120ed1-78a5-a849-adca-83f0a9e25bb6
d5cab3b
blep Bug #3200841: removed "warning C4127: conditional expression is const…
…ant" concerning infinite loop by replacing while (true) with for (;;).

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@182 1f120ed1-78a5-a849-adca-83f0a9e25bb6
b58e61c
blep - Bug #3200841: removed "warning C4127: conditional expression is con…
…stant" concerning infinite loop by replacing while (true) with for (;;). Added new JSON_FAIL macro. Commented unused parameters.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@183 1f120ed1-78a5-a849-adca-83f0a9e25bb6
55064d8
blep - 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@184 1f120ed1-78a5-a849-adca-83f0a9e25bb6
532a476
blep Untabified some sources
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@185 1f120ed1-78a5-a849-adca-83f0a9e25bb6
763cb61
blep Value::compare() is now const and has an actual implementation with u…
…nit tests.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@186 1f120ed1-78a5-a849-adca-83f0a9e25bb6
f9da3de
blep Fixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_…
…IS_AMALGAMATION

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@187 1f120ed1-78a5-a849-adca-83f0a9e25bb6
d341503
blep Release 0.6.0-rc2
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@188 1f120ed1-78a5-a849-adca-83f0a9e25bb6
8156c2b
blep Released 0.6.0-rc2
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@192 1f120ed1-78a5-a849-adca-83f0a9e25bb6
baab826
aaronjacobs Fixed a hard to debug crash on OS X related to sscanf format strings. b04388d
aaronjacobs Removed an unused typedef.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@194 1f120ed1-78a5-a849-adca-83f0a9e25bb6
e9e2b20
aaronjacobs Fixed constructor initializer list order warnings/errors.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@195 1f120ed1-78a5-a849-adca-83f0a9e25bb6
c718859
aaronjacobs Updated a cast to use a more appropriate type.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@196 1f120ed1-78a5-a849-adca-83f0a9e25bb6
0b25441
aaronjacobs Made two security fixes.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@197 1f120ed1-78a5-a849-adca-83f0a9e25bb6
83cdad4
aaronjacobs Centralized assertion macros and made them obey JSON_USE_EXCEPTION.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@198 1f120ed1-78a5-a849-adca-83f0a9e25bb6
8572b20
aaronjacobs Fixed a bunch of compilation errors when JSON_HAS_INT64 is set.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@199 1f120ed1-78a5-a849-adca-83f0a9e25bb6
68ff043
aaronjacobs Added some test cases that catch a parsing bug.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@200 1f120ed1-78a5-a849-adca-83f0a9e25bb6
5fddf39
aaronjacobs 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@201 1f120ed1-78a5-a849-adca-83f0a9e25bb6
ad1821d
aaronjacobs Fixed a missing include error.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@202 1f120ed1-78a5-a849-adca-83f0a9e25bb6
e0ec68b
aaronjacobs Added a .gitignore file, for ease of use with git-svn.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@203 1f120ed1-78a5-a849-adca-83f0a9e25bb6
6d36db6
aaronjacobs Fixed a "comparison between signed and unsigned" warning/error.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@204 1f120ed1-78a5-a849-adca-83f0a9e25bb6
0726080
aaronjacobs Fixed a whitespace problem.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@205 1f120ed1-78a5-a849-adca-83f0a9e25bb6
b6630f0
aaronjacobs Renamed test cases to make more sense with the upcoming new behavior of
isFoo methods.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@206 1f120ed1-78a5-a849-adca-83f0a9e25bb6
d5b6fc8
aaronjacobs Added some missing checks.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@207 1f120ed1-78a5-a849-adca-83f0a9e25bb6
f6c71fb
aaronjacobs Greatly fleshed out numeric type tests.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@208 1f120ed1-78a5-a849-adca-83f0a9e25bb6
c55c987
aaronjacobs Added tests for 64-bit integers.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@209 1f120ed1-78a5-a849-adca-83f0a9e25bb6
917ebd9
aaronjacobs Fixed some whitespace.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@210 1f120ed1-78a5-a849-adca-83f0a9e25bb6
61284c9
aaronjacobs Gave tests more general names in preparation for making them much more
comprehensive.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@211 1f120ed1-78a5-a849-adca-83f0a9e25bb6
977b2b7
aaronjacobs Made tests more comprehensive.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@212 1f120ed1-78a5-a849-adca-83f0a9e25bb6
aa1f628
aaronjacobs Fixed a test bug.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@213 1f120ed1-78a5-a849-adca-83f0a9e25bb6
4916f75
aaronjacobs Added tests for default numeric values.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@214 1f120ed1-78a5-a849-adca-83f0a9e25bb6
b4b4159
aaronjacobs Fixed bugs in asInt64 and asUInt64.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@215 1f120ed1-78a5-a849-adca-83f0a9e25bb6
d1b5215
aaronjacobs Gave a more consistent behavior to the Value::isFoo methods. See
NEWS.txt for more details.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@216 1f120ed1-78a5-a849-adca-83f0a9e25bb6
c5c6bcd
aaronjacobs Fixed a compilation warning/error.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@217 1f120ed1-78a5-a849-adca-83f0a9e25bb6
c1ab9d2
aaronjacobs Added line breaks to make error messages easier to read.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@218 1f120ed1-78a5-a849-adca-83f0a9e25bb6
b1ad1cc
aaronjacobs Fixed a 'comparison between signed and unsigned' error.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@219 1f120ed1-78a5-a849-adca-83f0a9e25bb6
cab900e
aaronjacobs Fixed test failures with 64-bit support disabled.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@220 1f120ed1-78a5-a849-adca-83f0a9e25bb6
a81bf89
aaronjacobs Removed some out of date TODOs.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@221 1f120ed1-78a5-a849-adca-83f0a9e25bb6
f9a1e30
aaronjacobs Made jsontest work with 64-bit integers, and fixed an error.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@222 1f120ed1-78a5-a849-adca-83f0a9e25bb6
3df0a17
aaronjacobs Made the unit test's output more readable, adding to jsontest's
capabilities (and simplifying its implementation) in the process.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@223 1f120ed1-78a5-a849-adca-83f0a9e25bb6
1da375d
aaronjacobs 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@224 1f120ed1-78a5-a849-adca-83f0a9e25bb6
f57736a
aaronjacobs Fixed a double -> float compilation warning/error.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@225 1f120ed1-78a5-a849-adca-83f0a9e25bb6
966c009
aaronjacobs Got rid of some unreachable code.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@226 1f120ed1-78a5-a849-adca-83f0a9e25bb6
843675a
aaronjacobs Fixed more default cases.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@227 1f120ed1-78a5-a849-adca-83f0a9e25bb6
6fc4b03
aaronjacobs Another round of attempting to fix VC++ errors...
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@228 1f120ed1-78a5-a849-adca-83f0a9e25bb6
1d32515
aaronjacobs Added a few test cases that Google is using internally for patches made
in the past.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@229 1f120ed1-78a5-a849-adca-83f0a9e25bb6
6f7f557
aaronjacobs Fixed some test bugs that show up when 64-bit mode is disabled.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@230 1f120ed1-78a5-a849-adca-83f0a9e25bb6
d2a40ad
blep - 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@231 1f120ed1-78a5-a849-adca-83f0a9e25bb6
43f1874
blep Fixed unit test failure on IBM AIX xlC by hard-coding the maxUInt64As…
…Double as double constant instead of relying on double(Value::maxUInt64) which produces an incorrect value.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@232 1f120ed1-78a5-a849-adca-83f0a9e25bb6
5b32279
blep Fixed MSVS 2003, 2005 and 2008 tests execution by normalizing floatin…
…g-point string representation using helper normalizeFloatingPointStr().

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@233 1f120ed1-78a5-a849-adca-83f0a9e25bb6
c5d5602
blep 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@234 1f120ed1-78a5-a849-adca-83f0a9e25bb6
6ead0d8
blep Fixed unit tests execution on MSVC 6 by removing usage of std::numeri…
…c_limits. It was returning 0 value in some max cases. Fixed Value::asFloat() to use integerToDouble().

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@235 1f120ed1-78a5-a849-adca-83f0a9e25bb6
bdf906c
christopherdunn Just testing whether I can still commit changes. I cannot tell my acc…
…ess-level from the sf project page.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@236 1f120ed1-78a5-a849-adca-83f0a9e25bb6
a4d0f84
christopherdunn 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@237 1f120ed1-78a5-a849-adca-83f0a9e25bb6
d164c72
christopherdunn More eol changes.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@238 1f120ed1-78a5-a849-adca-83f0a9e25bb6
1202b92
christopherdunn Simple changes to Reader initialization, from Chromium folks. (I do n…
…ot think this was submitted as a bug.)

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@239 1f120ed1-78a5-a849-adca-83f0a9e25bb6
807ee08
christopherdunn Another simple addition for constructor initialization, PathArgument.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@240 1f120ed1-78a5-a849-adca-83f0a9e25bb6
6dc5ccb
christopherdunn More missing constructor initializers found by Coverity.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@241 1f120ed1-78a5-a849-adca-83f0a9e25bb6
4dbdcd8
christopherdunn (bug#3314841) Fixed JSON_IS_AMALGAMATION. Using os.path for OSX filen…
…ame compatibility.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@242 1f120ed1-78a5-a849-adca-83f0a9e25bb6
3bbad3b
christopherdunn bug#3306345: minor typo in Path::resolve() -- missing bang.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@243 1f120ed1-78a5-a849-adca-83f0a9e25bb6
802f775
christopherdunn bug#2407932: strpbrk() could fail for NULL pointer.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@244 1f120ed1-78a5-a849-adca-83f0a9e25bb6
6962ce2
christopherdunn Updated bug-fix list.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@245 1f120ed1-78a5-a849-adca-83f0a9e25bb6
b0b7260
aaronjacobs Made JSON_USE_EXCEPTION's value in config.h a default that can be ove…
…rridden.

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

    g++ -D JSON_USE_EXCEPTION=0 ...



git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@246 1f120ed1-78a5-a849-adca-83f0a9e25bb6
e3d1414
aaronjacobs 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@247 1f120ed1-78a5-a849-adca-83f0a9e25bb6
e7d82ca
aaronjacobs Added an exit() to JSON_FAIL_MESSAGE to fix "no return" errors.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@248 1f120ed1-78a5-a849-adca-83f0a9e25bb6
dc8e373
aaronjacobs 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@249 1f120ed1-78a5-a849-adca-83f0a9e25bb6
df0ccbd
blep Added missing "include/json/assertions.h" header in amalgamate.py.
git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@250 1f120ed1-78a5-a849-adca-83f0a9e25bb6
725c5b6
@rjeczalik rjeczalik Moved merge leftovers. d8eebef
@mrtazz
Owner

awesome! thanks so much for taking the time to do this!

@mrtazz mrtazz merged commit 16d1aae into mrtazz:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 17, 2012
  1. @rjeczalik

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

    blep authored rjeczalik committed
    …path.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@157 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  2. @rjeczalik

    Fixed latest readme.txt url.

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@158 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  3. @rjeczalik

    Fixed bug #3139677: JSON [1 2 3] was incorrectly parsed as [1, 3]. Er…

    blep authored rjeczalik committed
    …ror is now correctly detected.
    
    Modified runjsontests.py to allow test that expect failure in jsoncpp test suite.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@159 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  4. @rjeczalik

    Fixed bug #3139678: stack buffer overflow when parsing a double with …

    blep authored rjeczalik committed
    …a length of 32 characters.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@160 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  5. @rjeczalik

    Renamed Reader::getFormatedErrorMessages() to getFormattedErrorMessag…

    blep authored rjeczalik committed
    …es. Bug #3023708 (Formatted has 2 't'). The old member function is deprecated but still present for backward compatibility.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@161 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  6. @rjeczalik

    Added known bug reference for experimental internal map.

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@162 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  7. @rjeczalik

    Added recommended include path.

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@163 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  8. @rjeczalik

    Added project URL.

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@164 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  9. @rjeczalik

    Added support for amalgated source and header generation (a la sqlite…

    blep authored rjeczalik committed
    …). 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@165 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  10. @rjeczalik

    Release test-0.6.0

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@166 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  11. @rjeczalik

    Release test-0.6.0

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@169 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  12. @rjeczalik

    Release 0.6.0-rc1

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@173 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  13. @rjeczalik

    Added support for amalgated source and header generation (a la sqlite…

    blep authored rjeczalik committed
    …). 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@177 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  14. @rjeczalik

    Need more tests on unicode

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@178 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  15. @rjeczalik

    Released 0.6.0-rc1

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@181 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  16. @rjeczalik

    Bug #3200841: removed "warning C4127: conditional expression is const…

    blep authored rjeczalik committed
    …ant" concerning infinite loop by replacing while (true) with for (;;).
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@182 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  17. @rjeczalik

    - Bug #3200841: removed "warning C4127: conditional expression is con…

    blep authored rjeczalik committed
    …stant" concerning infinite loop by replacing while (true) with for (;;). Added new JSON_FAIL macro. Commented unused parameters.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@183 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  18. @rjeczalik

    - Added unit tests for comparison operators (except compare())

    blep authored rjeczalik committed
    - Fixed Value::operator <= implementation (had the semantic of operator >=). Found when addigin unit tests for comparison operators.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@184 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  19. @rjeczalik

    Untabified some sources

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@185 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  20. @rjeczalik

    Value::compare() is now const and has an actual implementation with u…

    blep authored rjeczalik committed
    …nit tests.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@186 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  21. @rjeczalik

    Fixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_…

    blep authored rjeczalik committed
    …IS_AMALGAMATION
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@187 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  22. @rjeczalik

    Release 0.6.0-rc2

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@188 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  23. @rjeczalik

    Released 0.6.0-rc2

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@192 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  24. @rjeczalik
  25. @rjeczalik

    Removed an unused typedef.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@194 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  26. @rjeczalik

    Fixed constructor initializer list order warnings/errors.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@195 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  27. @rjeczalik

    Updated a cast to use a more appropriate type.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@196 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  28. @rjeczalik

    Made two security fixes.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@197 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  29. @rjeczalik

    Centralized assertion macros and made them obey JSON_USE_EXCEPTION.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@198 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  30. @rjeczalik

    Fixed a bunch of compilation errors when JSON_HAS_INT64 is set.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@199 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  31. @rjeczalik

    Added some test cases that catch a parsing bug.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@200 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  32. @rjeczalik

    Fixed a parsing bug in decodeNumber, updating the failing test cases …

    aaronjacobs authored rjeczalik committed
    …to be
    
    correct in the process. (The test cases incorrectly used exact integers instead
    of scientific notation.)
    
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@201 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  33. @rjeczalik

    Fixed a missing include error.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@202 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  34. @rjeczalik

    Added a .gitignore file, for ease of use with git-svn.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@203 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  35. @rjeczalik

    Fixed a "comparison between signed and unsigned" warning/error.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@204 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  36. @rjeczalik

    Fixed a whitespace problem.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@205 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  37. @rjeczalik

    Renamed test cases to make more sense with the upcoming new behavior of

    aaronjacobs authored rjeczalik committed
    isFoo methods.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@206 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  38. @rjeczalik

    Added some missing checks.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@207 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  39. @rjeczalik

    Greatly fleshed out numeric type tests.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@208 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  40. @rjeczalik

    Added tests for 64-bit integers.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@209 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  41. @rjeczalik

    Fixed some whitespace.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@210 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  42. @rjeczalik

    Gave tests more general names in preparation for making them much more

    aaronjacobs authored rjeczalik committed
    comprehensive.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@211 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  43. @rjeczalik

    Made tests more comprehensive.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@212 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  44. @rjeczalik

    Fixed a test bug.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@213 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  45. @rjeczalik

    Added tests for default numeric values.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@214 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  46. @rjeczalik

    Fixed bugs in asInt64 and asUInt64.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@215 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  47. @rjeczalik

    Gave a more consistent behavior to the Value::isFoo methods. See

    aaronjacobs authored rjeczalik committed
    NEWS.txt for more details.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@216 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  48. @rjeczalik

    Fixed a compilation warning/error.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@217 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  49. @rjeczalik

    Added line breaks to make error messages easier to read.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@218 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  50. @rjeczalik

    Fixed a 'comparison between signed and unsigned' error.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@219 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  51. @rjeczalik

    Fixed test failures with 64-bit support disabled.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@220 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  52. @rjeczalik

    Removed some out of date TODOs.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@221 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  53. @rjeczalik

    Made jsontest work with 64-bit integers, and fixed an error.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@222 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  54. @rjeczalik

    Made the unit test's output more readable, adding to jsontest's

    aaronjacobs authored rjeczalik committed
    capabilities (and simplifying its implementation) in the process.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@223 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  55. @rjeczalik

    Reworked the type conversion system again, so that:A

    aaronjacobs authored rjeczalik committed
     *  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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@224 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  56. @rjeczalik

    Fixed a double -> float compilation warning/error.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@225 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  57. @rjeczalik

    Got rid of some unreachable code.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@226 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  58. @rjeczalik

    Fixed more default cases.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@227 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  59. @rjeczalik

    Another round of attempting to fix VC++ errors...

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@228 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  60. @rjeczalik

    Added a few test cases that Google is using internally for patches made

    aaronjacobs authored rjeczalik committed
    in the past.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@229 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  61. @rjeczalik

    Fixed some test bugs that show up when 64-bit mode is disabled.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@230 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  62. @rjeczalik

    - Fixed unit test compilation on MSVS 2003, 2005 and 2008.

    blep authored rjeczalik committed
    - 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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@231 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  63. @rjeczalik

    Fixed unit test failure on IBM AIX xlC by hard-coding the maxUInt64As…

    blep authored rjeczalik committed
    …Double as double constant instead of relying on double(Value::maxUInt64) which produces an incorrect value.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@232 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  64. @rjeczalik

    Fixed MSVS 2003, 2005 and 2008 tests execution by normalizing floatin…

    blep authored rjeczalik committed
    …g-point string representation using helper normalizeFloatingPointStr().
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@233 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  65. @rjeczalik

    Fixed compilation issues with MSVC 6: replace usage of ostringstream …

    blep authored rjeczalik committed
    …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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@234 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  66. @rjeczalik

    Fixed unit tests execution on MSVC 6 by removing usage of std::numeri…

    blep authored rjeczalik committed
    …c_limits. It was returning 0 value in some max cases. Fixed Value::asFloat() to use integerToDouble().
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@235 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  67. @rjeczalik

    Just testing whether I can still commit changes. I cannot tell my acc…

    christopherdunn authored rjeczalik committed
    …ess-level from the sf project page.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@236 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  68. @rjeczalik

    Switched CRLF to LF in repo, and added svn:eol-style native. I might …

    christopherdunn authored rjeczalik committed
    …have missed a few files though. Just committing what I have so far.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@237 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  69. @rjeczalik

    More eol changes.

    christopherdunn authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@238 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  70. @rjeczalik

    Simple changes to Reader initialization, from Chromium folks. (I do n…

    christopherdunn authored rjeczalik committed
    …ot think this was submitted as a bug.)
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@239 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  71. @rjeczalik

    Another simple addition for constructor initialization, PathArgument.

    christopherdunn authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@240 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  72. @rjeczalik

    More missing constructor initializers found by Coverity.

    christopherdunn authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@241 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  73. @rjeczalik

    (bug#3314841) Fixed JSON_IS_AMALGAMATION. Using os.path for OSX filen…

    christopherdunn authored rjeczalik committed
    …ame compatibility.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@242 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  74. @rjeczalik

    bug#3306345: minor typo in Path::resolve() -- missing bang.

    christopherdunn authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@243 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  75. @rjeczalik

    bug#2407932: strpbrk() could fail for NULL pointer.

    christopherdunn authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@244 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  76. @rjeczalik

    Updated bug-fix list.

    christopherdunn authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@245 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  77. @rjeczalik

    Made JSON_USE_EXCEPTION's value in config.h a default that can be ove…

    aaronjacobs authored rjeczalik committed
    …rridden.
    
    This allows users to override it with their compiler invocation. For example:
    
        g++ -D JSON_USE_EXCEPTION=0 ...
    
    
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@246 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  78. @rjeczalik

    Got rid of several unnecessary includes of <iostream>.

    aaronjacobs authored rjeczalik committed
    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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@247 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  79. @rjeczalik

    Added an exit() to JSON_FAIL_MESSAGE to fix "no return" errors.

    aaronjacobs authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@248 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  80. @rjeczalik

    Made it possible to drop null placeholders from array output.

    aaronjacobs authored rjeczalik committed
    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: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@249 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  81. @rjeczalik

    Added missing "include/json/assertions.h" header in amalgamate.py.

    blep authored rjeczalik committed
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@250 1f120ed1-78a5-a849-adca-83f0a9e25bb6
Commits on Dec 20, 2012
  1. @rjeczalik

    Moved merge leftovers.

    rjeczalik authored
Something went wrong with that request. Please try again.