3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-14 09:57:56 +08:00
Code Issues Projects Releases Wiki Activity
326 Commits 3 Branches 55 Tags 5.5 MiB
Commit Graph

326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Buck
ebe2d6e6ee Updated documentation links to point to GitHub 2014-10-20 07:59:44 +02:00
I3ck
ab19fa1d6f Removed typo in README 2014-10-13 12:17:53 +02:00
Christopher Dunn
bc8b5d871f Merge pull request #52 from cquammen/master 
Removed unneeded newlines from parsed comments
 2014-10-11 16:40:51 -05:00
Cory Quammen
fd06bfca79 Removed unneeded newlines from parsed comments 
Newlines from comments separated by lines are retained when comments
are appended, so adding a newline between separate comments for a
node is not needed.
 2014-10-09 16:33:29 -04:00
Cory Quammen
4d23492d11 Added printing of comments to *.actual test files 
This enables testing of comment-handling code. Updated *.expected test
result files to account for printing of comments.
 2014-10-09 16:33:29 -04:00
Christopher Dunn
aa650c5b9d Merge pull request #50 from sergzub/master 
CMake 2.8.5 or higher is required
 2014-10-05 12:04:46 -05:00
sergzub
ae5a56f9ff CMake 2.8.5 or higher is required 
make with error for the lower version:

Linking CXX executable ../../bin/jsoncpp_test
/bin/sh: $<TARGET_FILE:jsoncpp_test>: command not found
make[2]: *** [bin/jsoncpp_test] Error 127
make[1]: *** [src/test_lib_json/CMakeFiles/jsoncpp_test.dir/all] Error 2
make: *** [all] Error 2

due to 
http://stackoverflow.com/questions/5410164/how-do-i-use-a-targets-path-in-add-custom-command-in-cmake#comment6139682_5410794
 2014-10-03 16:40:58 +04:00
Christopher Dunn
8aec8d88f2 Merge pull request #46 from chuckatkins/fix-for-old-msvc 
Workaround for missing C99 functions in older versions of Visual Studio
 2014-09-20 14:05:18 -07:00
Chuck Atkins
9dc9026e0b Workaround for missing C99 functions in older versions of Visual Studio 2014-09-19 13:16:09 -04:00
Christopher Dunn
4002f8a4be Revert "Revert "Removed vim mode lines."" 
This reverts commit af77b5b59456f6a9c7a9c6a5464001ef5665f897.

See discussion at
  32009b17e4 (commitcomment-7827708)
 2014-09-18 16:46:40 -07:00
Christopher Dunn
0375af2eb5 drop version qualifier 
This should help keep version.h stable.

    x.y.z-dev
    => major, minor, patch, qual
    == x, y, z, -dev

But we do not need -dev anymore.
 2014-09-18 16:43:07 -07:00
Aaron Jacobs
ba330893d7 Ran clang-format again, this time hitting .inl files too. 
clang-format -i $(find . -name '*.h' -or -name '*.cpp' -or -name '*.inl')
 2014-09-18 16:33:49 -07:00
Christopher Dunn
57dde78308 Merge pull request #45 from jonessen96/master 
Added Version definition to the pkg-config file
 2014-09-18 16:33:29 -07:00
Jonas Platte
69c324ead5 Added Version definition to the pkg-config file 2014-09-17 20:37:59 +02:00
Christopher Dunn
263a4706fa Merge pull request #44 from cdunn2001/version 
0.7.0
 2014-09-16 19:11:59 -07:00
Christopher Dunn
4bceabf2f9 ws autogen 2014-09-16 19:11:20 -07:00
Christopher Dunn
877dd17206 bump version; proper SOVERSION 2014-09-16 12:42:33 -07:00
Christopher Dunn
16709c6ee8 JSONCPP_VERSION, not JSON_CPP_VERSION 2014-09-16 12:42:33 -07:00
Christopher Dunn
b2a1ca5b54 in dev.makefile, build shared too 2014-09-16 12:42:33 -07:00
Christopher Dunn
9aa4681052 Revert "Merge branch 'no-version'" 
This reverts commit d9ced92d4040ee6c1475e96e18d715f99647e668, reversing
changes made to d2fa664a12b478b3fd21f7659f3674c8520bf43b.

Conflicts:
	include/json/version.h (keep)
 2014-09-16 12:42:32 -07:00
Christopher Dunn
af77b5b594 Revert "Removed vim mode lines." 
This reverts commit 32009b17e4d35a812575cfcf6bae9ec49fc67446.
 2014-09-16 12:42:32 -07:00
Aaron Jacobs
11086dd6a7 Enabled PointerBindsToType in clang-format options. 2014-09-15 10:15:29 +10:00
Aaron Jacobs
30b07c0275 Ran clang-format over all .h and .cpp files. 
clang-format -i $(find . -name '*.h' -or -name '*.cpp')
 2014-09-15 10:14:48 +10:00
Aaron Jacobs
32009b17e4 Removed vim mode lines. 
Users can set their own preferences in their personal vimrc.
 2014-09-15 08:23:41 +10:00
Christopher Dunn
b4357fa224 Merge pull request #41 from bmcdorman/feature-arrow_operator 
Added arrow operator to ValueIterator and ValueConstIterator
 2014-09-14 08:17:03 -07:00
Braden McDorman
540db3b052 Added arrow operator to ValueIterator and ValueConstIterator 2014-09-14 08:15:47 -07:00
Christopher Dunn
f4b06cd607 rm trailing ws 2014-09-14 08:15:32 -07:00
Christopher Dunn
dd5b57a3d9 Merge pull request #42 from jonessen96/master 
Add pkg-config support
 2014-09-14 07:54:13 -07:00
Jonas Platte
6270858c43 Added pkg-config file 2014-09-14 15:45:07 +02:00
Christopher Dunn
d9ced92d40 Merge branch 'no-version' 
We can modify version.h directly, as desired. It is retained for
backward-compatibility, in case anyone is using those macros.

Note: I have not modified SConstruct since that is deprecated, so
I have retained the `version` file, which should be ignored.

Addresses issue #38
 2014-09-11 10:10:40 -07:00
Christopher Dunn
8f730b8a60 stop using version.h.in for cmake 2014-09-11 10:09:48 -07:00
Christopher Dunn
b061ff4a1e generated for the last time, maybe 2014-09-11 10:04:49 -07:00
Christopher Dunn
8ececfa538 stop ignoring version.h 2014-09-11 10:04:23 -07:00
Christopher Dunn
d2fa664a12 makefile for simple testing 
This is hard to use within Travis-ci.com because that uses
build variants.
 2014-09-10 18:03:34 -07:00
Christopher Dunn
b7894977e7 deprecate makerelease.py (someday drop version.h too?) 2014-09-10 18:01:10 -07:00
Christopher Dunn
53262c66d9 Merge branch 'SuperManitu:python3' from issue #36 2014-09-10 17:29:07 -07:00
Christopher Dunn
09228968ea fix for python2 2014-09-10 17:26:46 -07:00
SuperManitu
83b43caf8e allow python3 2014-09-10 11:09:35 -07:00
Aaron Jacobs
0dc03d0848 Merge pull request #37 from BillyDonahue/value-efficiency 
Switch to copy-and-swap idiom for operator=.
 2014-09-10 10:52:26 -07:00
Billy Donahue
45cd9490cd Switch to copy-and-swap idiom for operator=. 
This allows the compiler to elide a copy when rhs is a temporary.
 2014-09-10 10:37:34 -07:00
Christopher Dunn
236db83742 ws 2014-09-10 10:35:01 -07:00
findblar
a70b00750d pull request #35 from finblarr:patch-1 
fix build directory, within repo tree
 2014-09-10 10:32:51 -07:00
Christopher Dunn
033677cc1a Merge pull request #30 from mloy/redundant-strlen 2014-09-03 14:07:40 -07:00
Christopher Dunn
9d694516a0 clarify return value 2014-09-03 13:54:49 -07:00
Christopher Dunn
d94caac1ea ws 2014-09-03 13:46:37 -07:00
mloy
8eb6f88a87 snprintf does return a signed integer 
assert if returned value is neagtive
 2014-09-03 13:37:17 -07:00
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 0db9d6ea013792b010c598c2a9a3a9e39a2decd9, reversing
changes made to 06dcb1fc8922991919887e229fdd741bccde0dfa.

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
Aaron Jacobs
c151549937 Gave the reader/writer test section a makeover. 2014-07-01 13:11:05 +10:00
Aaron Jacobs
d61fa29da8 Gave the amalgamated source section a makeover. 2014-07-01 13:09:15 +10:00
Aaron Jacobs
b2a086adeb Gave the documentation section a makeover. 2014-07-01 13:07:21 +10:00
Aaron Jacobs
8d0f8d0dcd Gave the testing section a makeover. 2014-07-01 13:06:40 +10:00