Matthias Loy
64d591b720
snprintf already calculated the length
2014-09-03 13:37:17 -07:00
Matthias Loy
fe2cd01e80
free does nothing if parameter equals NULL
2014-09-03 13:37:17 -07:00
Christopher Dunn
b02ff20bd3
Merge pull request #33 from donmilham/master
...
added option to FastWriter which omits the trailing new line character
2014-09-03 13:32:53 -07:00
Don Milham
5bf16105b5
added option to FastWriter which omits the trailing new line character
2014-09-02 17:09:07 -06:00
Christopher Dunn
3515db184a
Merge pull request #29 from mloy/type-punned-pointer
...
Type punned pointer
I'll revert this if anyone reports a problem. *strict-aliasing* is not my favorite compiler warning.
2014-08-13 23:41:05 -07:00
Matthias Loy
48d9a92a1b
do intermediate step in order to omit "dereferencing type-punned pointer" error
2014-08-13 13:20:29 +02:00
Matthias Loy
f97723dbb7
provoke compile error:
...
"dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]"
2014-08-13 13:19:02 +02:00
Christopher Dunn
1a6426ac19
Merge pull request #21 from hiharin/master
...
Hmmm. Not ideal. A round-trip should reproduce the original, but null -> NaN -> ? But I guess it's no worse than it was.
The different behavior for Win CE is troubling, but it only affects people who are using these extreme values.
I've worked with Inf/NaN before, so I understand your pain.
2014-08-13 02:03:55 -07:00
David West
bc5dbc6d41
Patch for bug #53 on version 0.5.0
...
This is a patch that we have utilized at IDEXX Labs for the the bug described above.
We have tested and verified this on x86 32 and 64 bit linux and 32 bit arm.
2014-08-13 02:03:33 -07:00
Christopher Dunn
1ac2295c21
Merge pull request #27 from egor-tensin/master
...
Fixed deprecated target file path location
+1 for fixing indentation!
2014-08-13 02:03:18 -07:00
Egor Tensin
81d16dfda1
Fixed deprecated target file path location
2014-08-13 02:02:53 -07:00
Christopher Dunn
c138933784
Merge pull request #26 from alex-ac/master
...
Fix CMake subproject behaviour.
Sweet. But doesn't this assume that people call the subproject `jsoncpp`? It used to be `json-cpp`.
2014-08-13 02:02:33 -07:00
Aleksandr Derbenev
b3deb61f87
Fix CMake subproject behaviour.
2014-08-13 02:01:38 -07:00
Christopher Dunn
740e0207b1
Merge pull request #25 from cgilling/master
...
add tests to check that exceptions are thrown for wrong types
Nice!
For the record, I would have put the add-failure into the `try` block, for simplicity.
2014-08-13 02:01:11 -07:00
Chris Gilling
97c77b4a86
add tests to check that exceptions are thrown for wrong types
...
* Add JSONTEST_ASSERT_THROWS macro to test if an expression
throws an exceptions.
* add JSONTEST_FIXTURE(ValueTest, typeChecksThrowExceptions)
2014-08-13 02:00:41 -07:00
Christopher Dunn
7ebdabc059
Merge pull request #23 from mloy/msvc2010
...
Solution and project files for MSVC 2010
We'll just trust you on this. Thanks for the contribution.
2014-08-13 01:59:52 -07:00
mloy
c6d9424f71
project files for msvc2010
2014-08-13 01:57:45 -07:00
mloy
19d0ece5f9
add solution for msvc 2010
2014-08-13 01:57:45 -07:00
Christopher Dunn
35e4f2abd6
Merge pull request #22 from AlexeyKruchinin/patch-1
...
Update README.md
2014-08-13 01:01:37 -07:00
Alexey Kruchinin
b548cdf49c
Update README.md
2014-08-06 23:24:34 -04:00
Christopher Dunn
3b9b7402fd
Merge pull request #14 from eightnoteight/master
...
header.add_file (version.h) temporarily commented | header include path modified
2014-07-13 23:52:14 -07:00
eightnoteight
3585477f33
add file version.h temporarily commented | header include path modified
2014-07-14 11:11:14 +05:30
pffang
27e3263894
WinCE Compatibility Fix
...
Note: str.imbue and std::locale::classic() are not supported on WINCE
2014-07-10 20:27:52 -07:00
Christopher Dunn
8582876c5c
vim modelines
2014-07-10 20:24:23 -07:00
Christopher Dunn
496c655523
fix numeric locale
...
In some locales (e.g. de_DE) floats have commas instead of
dots, but JSON requires dots.
See:
https://github.com/open-source-parsers/jsoncpp/pull/9
https://github.com/open-source-parsers/jsoncpp/pull/3
2014-07-10 20:24:23 -07:00
Christopher Dunn
49c732607b
Revert "Merge pull request #7 from steffen-kiess/fix-locale"
...
This reverts commit 0db9d6ea01
, reversing
changes made to 06dcb1fc89
.
For discussion, see
https://github.com/open-source-parsers/jsoncpp/pull/9
https://github.com/open-source-parsers/jsoncpp/pull/3
2014-07-10 19:59:26 -07:00
Christopher Dunn
655a9db0cc
Merge pull request #11 from cdunn2001/inc
...
improve some includes
2014-07-09 21:53:40 -07:00
Christopher Dunn
f3989977c0
rm generated version.h
2014-07-09 21:48:49 -07:00
Christopher Dunn
60f778b9fc
relative include
2014-07-09 21:40:23 -07:00
Christopher Dunn
50f6779578
Merge pull request #10 from cdunn2001/doxy
...
Doxy
2014-07-09 21:29:18 -07:00
Christopher Dunn
5a65132e72
README/NEWS links
2014-07-09 11:48:27 -07:00
Christopher Dunn
bef834edca
update docs for open-source-parsers org
2014-07-09 11:48:27 -07:00
Christopher Dunn
0973f2e6bc
after doxygen -u
2014-07-09 11:48:27 -07:00
Christopher Dunn
5031a59518
doxygen changed
2014-07-09 11:48:27 -07:00
Christopher Dunn
5850b83a5b
moved roadmap to wiki
2014-07-09 11:48:26 -07:00
Christopher Dunn
9dd7eea945
fix doxybuild.py paths
2014-07-09 11:48:26 -07:00
Christopher Dunn
35bea41bc9
update docs for github
2014-07-09 11:48:26 -07:00
Christopher Dunn
542cd1d3f5
remove some sourceforge links
2014-07-09 11:48:26 -07:00
Christopher Dunn
ba50403414
ignore doxygen stuff
2014-07-09 11:48:26 -07:00
Christopher Dunn
0db9d6ea01
Merge pull request #7 from cdunn2001/fix-locale
...
Use std::stringstream instead of snprintf() for double->string conversion
2014-07-09 11:47:48 -07:00
Steffen Kieß
b8aaa03367
Use std::stringstream instead of snprintf() for double->string conversion
...
`snprintf()` will use the current `LC_NUMERIC` locale
for converting a double to a string,
which will use a `,` instead of a `.` in some locales (e.g. de_DE).
`std::stringstream` allows setting the locale to `"C"` to always get a `.`.
This occurs only for that `stringstream` instance; no global is
altered.
2014-07-09 11:46:00 -07:00
Christopher Dunn
06dcb1fc89
cmake updates this
2014-07-08 21:57:12 -07:00
Christopher Dunn
973de3988b
Merge pull request #1 from cdunn2001/patch-renu555
...
dead-code patch by renu555
2014-07-05 19:10:34 -07:00
renu555
41b79398a3
Always true condition.
...
for (int index = 0; index < size && !isMultiLine; ++index)
In addition to dead code, in the above if condition checking to !isMultiLine is of no use as it will be always true and hence "for" depends only on condition [index < size.]
The mentioned test case works fine in this case also.
2014-07-05 19:05:41 -07:00
renu555
66b77384d8
Fix dead code scenario.
...
Changes explained
2014-07-05 19:05:41 -07:00
renu555
17c244e644
Fixing unreachable condition.
...
if (!isMultiLine) at line 563 suggests that isMultiline is 0 when if takes true branch. So the condition && at line 571 will always be false.
Also at line 568 !isMultiline in loop conditional check suggests that it depends only on one condition i.e. index <size because !isMultiline is always true.
Hence , it seems logical mistake at line 571 of using && instead of ||
2014-07-05 19:05:41 -07:00
Christopher Dunn
8050d8b677
Merge pull request #6 from cdunn2001/fix-static-init
...
I will try to pull the other changes from Chromium as well.
This passed Travis.
2014-07-05 17:39:19 -07:00
Christopher Dunn
28836b8acc
fix bug for static init
...
Ugh! Static initialization of instance variables is a very bad idea.
This fix is taken from the Chromium code-base. It includes their
double-fix for ARM.
* https://codereview.chromium.org/24984004
* https://src.chromium.org/viewvc/chrome?revision=226099&view=revision
* https://code.google.com/p/webrtc/issues/detail?id=1777
2014-07-05 17:36:20 -07:00
Aaron Jacobs
47f1577fd3
Gave the license section a makeover.
2014-07-01 13:13:46 +10:00
Aaron Jacobs
9cc184146f
Gave the test output section a makeover.
2014-07-01 13:13:03 +10:00