3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-27 11:21:02 +08:00
Code Issues Projects Releases Wiki Activity
333 Commits 2 Branches 55 Tags 5.5 MiB
Commit Graph

333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Dunn
533dbe0898 Update README.md 
Note on C++11
 2014-11-03 12:39:01 -06:00
Christopher Dunn
6cb2f7bd65 Merge pull request #58 from autochthe/master 
Add public semantic error reporting
 2014-10-29 22:41:50 -05:00
Mara Kim
b84a39cae5 Add public semantic error reporting 
Closes open-source-parsers/jsoncpp#57
 2014-10-23 02:18:14 -05:00
Christopher Dunn
7bd75b0fb4 Merge pull request #55 from glehmann/build-env 
use the CXXFLAGS and LINKFLAGS environment variable in scons
 2014-10-21 12:38:05 -05:00
Gaëtan Lehmann
f74a4ff17a use the CXXFLAGS and LINKFLAGS environment variable in scons 
this allows homebrew to use its own flags during the build
 2014-10-21 11:43:53 +02:00
Aaron Jacobs
b7eccbb110 Merge pull request #54 from I3ck/master 
Updated documentation links to point to GitHub
 2014-10-20 22:06:26 +11:00
Martin Buck
ebe2d6e6ee Updated documentation links to point to GitHub 2014-10-20 07:59:44 +02:00
Christopher Dunn
4cd31f01bb Merge pull request #53 from I3ck/master 
Removed typo in README
 2014-10-13 07:24:07 -05: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