3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-15 10:37:55 +08:00
Code Issues Projects Releases Wiki Activity
1,269 Commits 3 Branches 55 Tags 5.5 MiB
Commit Graph

1269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Dunn
6eaf150dc7 Merge pull request #109 from open-source-parsers/double-string-double 
Double string double
1.1.0 		2015-01-06 12:54:39 -06:00
Christopher Dunn
8b489f891a 1.1.0 <- 1.0.0 2015-01-06 12:46:17 -06:00
Christopher Dunn
65cee6ea16 fix double->string->double round-trip (bump minor ver.) 
See #98.
  http://stackoverflow.com/questions/747470/what-is-the-meaning-of-numeric-limitsdoubledigits10/16941784#16941784
 2015-01-06 12:40:36 -06:00
Christopher Dunn
dfc5f879c1 Merge pull request #108 from open-source-parsers/quote-spaces 
quote cmdline arg
 2015-01-06 12:14:48 -06:00
Christopher Dunn
1a4dc3a888 quote cmdline arg 
See #99.
 2015-01-06 12:11:12 -06:00
Christopher Dunn
0f6884f771 Merge pull request #106 from Gachapen/fix_cmake_install 
Fix cmake_package install being broken because of wrong include path.
 2015-01-06 11:50:13 -06:00
Magnus Bjerke Vik
748328a0d1 Fix cmake_package install being broken because of wrong include path. 
The TARGET_INCLUDE_DIRECTORIES from inside the
IF(JSONCPP_WITH_CMAKE_PACKAGE) block was removed, since it only needs to
be set once.

In addition the CMAKE_VERSION check was simplified.
 2015-01-06 09:51:44 +01:00
Christopher Dunn
f44278cd4e Merge pull request #101 from dominicpezzuto/master 
Fix build issues related to Solaris and older GCC
 2015-01-03 14:45:41 -06:00
dominicpezzuto
d2b6992f3e Fix build issues related to Solaris and older GCC 
Fixed two build issues:
 - JsonCPP currently doesn’t compile for Solaris due to platform
differences with ‘isfinite’ function.  Fixed by adding proper include
and define for Solaris.
 - JsonCPP currently doesn’t compile for GCC version 4.1.2 and earlier
due to use of ‘-Werror=*’ compile flag, which was introduced in a later
version.  Fixed by adding version check to only add this flag on
supported versions of GCC.
 2014-12-27 16:45:40 -05:00
dominicpezzuto
54764dd85b Fix build issues related to Solaris and older GCC 
Fixed two build issues:
 - JsonCPP currently doesn’t compile for Solaris due to platform
differences with ‘isfinite’ function.  Fixed by adding proper include
and define for Solaris.
 - JsonCPP currently doesn’t compile for GCC version 4.1.2 and earlier
due to use of ‘-Werror=*’ compile flag, which was introduced in a later
version.  Fixed by adding version check to only add this flag on
supported versions of GCC.
 2014-12-27 16:44:26 -05:00
Christopher Dunn
8dd32e1e2e Merge pull request #94 from Gachapen/cmake_target_include 
CMake: Add include directory to jsoncpp_lib target

Well-researched. Passes Travis CI.
 2014-12-24 01:30:13 -06:00
Magnus Bjerke Vik
3fd7f8b470 CMake: Only add include directory to jsoncpp_lib target if CMake version supports the command. 2014-12-16 08:58:52 +01:00
Magnus Bjerke Vik
e99e6d9cc6 CMake: Add include directory to jsoncpp_lib target so that it can be easier used with other projects. 2014-12-03 15:42:41 +01:00
Christopher Dunn
9ca1aaab14 Merge pull request #93 from akien-mga/master 
Small packaging improvements
 2014-12-02 00:40:08 -06:00
Rémi Verschelde
27639ce578 Add support for BUILD_SHARED_LIBS argument 
BUILD_SHARED_LIBS is a standard CMake argument that serves the purpose
of the custom JSONCPP_LIB_BUILD_SHARED. For now we force JSONCPP_LIB_BUILD_SHARED
to true if BUILD_SHARED_LIBS was defined.
Workaround for #51.
 2014-12-01 23:47:21 +01:00
Rémi Verschelde
f8a3a599ac Adapt libdir for 64bit RPM-based distros 
RPM-based distros such as Fedora or Mageia put 64bit libraries in /usr/lib64
while 32bit libraries go to /usr/lib. This is usually taken into account
in CMake projects using a LIB_SUFFIX parameter that can be set to "" or "64".
 2014-12-01 23:44:08 +01:00
Christopher Dunn
7165f6ac4c 1.0.0 1.0.0 2014-11-20 08:45:58 -06:00
Christopher Dunn
37a9fa9f9d 1.0.0 2014-11-20 00:20:51 -06:00
xiaoyur347
83683da13f fix gcc warning when CXXFLAGS contains '-Wextra' 
json_value.cpp:179:26: warning: enumeral and non-enumeral type in conditional expression [enabled by default]

https://github.com/open-source-parsers/jsoncpp/pull/84
 2014-11-19 23:59:34 -06:00
Christopher Dunn
e5de78db82 Merge pull request #87 from cdunn2001/master 
2to3 (but only the changes which should work with python2 also)
 2014-11-19 23:54:56 -06:00
Christopher Dunn
ffd7295ab8 simple 2014-11-19 23:35:56 -06:00
Christopher Dunn
433876866d ws 2014-11-19 23:34:15 -06:00
Christopher Dunn
bd1e895287 simple py3 changes 2014-11-19 23:30:47 -06:00
Christopher Dunn
9aa6144b2a python except as 2014-11-19 23:10:02 -06:00
Christopher Dunn
5fda247dab Merge pull request #79 from ya1gaurav/patch-2 
Remove gcc compilation warnings in json_reader.cpp
 2014-11-18 00:14:06 -06:00
Gaurav
767713be2b Remove gcc compilation warning in json_reader.cpp 
Submitting Patch for Issue : https://github.com/open-source-parsers/jsoncpp/issues/77
It will fix warnings in json_reader.cpp
 2014-11-17 14:04:03 +05:30
Aaron Jacobs
3e3a8d5bd2 Merge pull request #74 from ya1gaurav/master 
Prefer appending character constants over string literals.
 2014-11-14 10:39:03 +11:00
Gaurav
abc1e07543 Prefer appending character constants over string literals - correct patch. 
Submitting correct patch for https://github.com/open-source-parsers/jsoncpp/issues/61
 2014-11-13 12:47:19 +05:30
Christopher Dunn
00b0a1b992 Merge pull request #70 from jmesmon/pkg-config-include-var 
pkg-config: support INCLUDE_INSTALL_DIR
 2014-11-12 00:03:52 -06:00
Cody P Schafer
1fe6c59827 pkg-config: support INCLUDE_INSTALL_DIR 2014-11-11 16:09:05 -05:00
Aaron Jacobs
20672ed02c Merge pull request #68 from BillyDonahue/refactor_ctor_boilerplate 
Json::Value: Refactor common code in all constructors to an initBasic() function.
 2014-11-10 20:23:52 +11:00
Billy Donahue
8eb5d89db6 Remove initInt and initUInt until they are needed. 2014-11-10 01:35:42 -05:00
Christopher Dunn
9c80798038 Merge pull request #63/#67 from dreifachstein/master 
Allow customization of component install dirs
Passed Travis CI.
 2014-11-08 15:56:36 -06:00
Yu Xiaolei
72e5223658 Fix default runtime install dir 2014-11-05 13:18:16 +08:00
Yu Xiaolei
dc84d96a49 Add CMake package file generation support 2014-11-05 12:31:44 +08:00
Yu Xiaolei
1c3a20de50 Allow customization of component install dirs 2014-11-05 11:25:53 +08:00
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
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