3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-28 03:50:53 +08:00
Code Issues Projects Releases Wiki Activity
1,232 Commits 2 Branches 55 Tags 5.5 MiB
Commit Graph

1232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Dunn
692164d471 Update header.html 2017-09-10 19:55:08 -05:00
Christopher Dunn
c95a841fef Generated new header.html 2017-09-10 19:55:08 -05:00
Christopher Dunn
e895eccd18 Generated new footer.html 2017-09-10 19:55:07 -05:00
Christopher Dunn
3b5f8bef41 Merge pull request #667 from cdunn2001/foo 
Drop stderr
 2017-09-09 15:15:10 -05:00
Christopher Dunn
c89f0282d1 Do not write to stderr 
fixes #665
closes #666
 2017-09-09 14:49:55 -05:00
Christopher Dunn
1b68b02ccd Try adding python-3.5 in TravisCI 2017-09-09 14:48:02 -05:00
Christopher Dunn
adb9ab1424 Merge pull request #660 from SloCompTech/master 
fixes #659
fixes #661
 2017-09-05 02:58:50 -05:00
Martin Dagarin
49da91c786 Fixed compile bug 2017-09-04 21:10:15 +02:00
Martin Dagarin
e8378d1e74 Fixed swiched parameters in install 2017-09-04 21:07:49 +02:00
Christopher Dunn
2de18021fc Merge pull request #655 from cdunn2001/fix-649 
Fixes #649
Fixes #654
1.8.3 		2017-08-28 09:11:00 -05:00
Christopher Dunn
c98e1d85e3 Bump to soversion=19, 1.8.3 
Note that cmake is deprecated, but we keep it in-sync manually for now.
 2017-08-28 09:04:33 -05:00
Christopher Dunn
d830c0ab94 Fix writeCommentBeforeValue() iter deref 
fixes #649
 2017-08-28 08:43:05 -05:00
Christopher Dunn
90591c70cd Suppress GCC deprecated-declarations warning for tests 2017-08-28 08:42:43 -05:00
Christopher Dunn
4cfae897c0 Merge pull request #652 from cdunn2001/meson-not-scons 
Meson not scons; 1.8.2<-1.8.1
1.8.2 		2017-08-27 15:30:15 -05:00
Christopher Dunn
f4ec601fd3 Drop NEWS.txt 
Older news can be found at
* https://github.com/open-source-parsers/jsoncpp/wiki/News
 2017-08-27 15:23:55 -05:00
Christopher Dunn
d40f26d472 Move amalgamated source details to wiki 2017-08-27 15:16:43 -05:00
Christopher Dunn
c668af9d41 Update README 
* Document meson/ninja.
* Deprecate cmake.
* Drop scons.
 2017-08-27 15:11:40 -05:00
Christopher Dunn
13b5ed7287 1.8.2 <- 1.8.1 
Soon, I hope to drop the cmake stuff and let meson handle
the version numbers.
 2017-08-27 15:02:01 -05:00
Christopher Dunn
6d31cec7cf Drop scons support 2017-08-27 15:02:01 -05:00
Christopher Dunn
5331d295aa Merge branch 'fix-578' 2017-08-27 14:17:31 -05:00
Christopher Dunn
004270db37 Avoid memory error 
But simply use `.assign()` instead of the extra copy. (See comment from
@BillyDonhue at #580.)

fixes #578
closes #580
 2017-08-27 14:16:01 -05:00
Gaurav
9006194139 Fix uninitialized value detected by valgrind 
Fix issue reported in https://github.com/open-source-parsers/jsoncpp/issues/578
For std::string variable, length() is more readable than size().
 2017-08-27 14:16:01 -05:00
Christopher Dunn
6062f9b848 Merge pull request #641 from maksdamir/master 
Fixing warnings. Added JSONCPP_DEPRECATED definition for clang. Also …
 2017-08-05 15:45:01 -05:00
damiram
ef16a35328 Fixing warnings. Added JSONCPP_DEPRECATED definition for clang. Also updating .gitignore to ignore .DS_Store files (Mac OS Finder generated) 2017-08-02 22:44:42 -07:00
Christopher Dunn
7354da8077 Merge pull request #640 from cfyzium/master 
Fix non-rvalue Json::Value assignment operator (should copy, not move)
 2017-08-01 01:22:41 -05:00
Александр Малинин
6a15ca6442 Fix non-rvalue Json::Value assignment operator (should copy, not move) 2017-07-31 15:29:02 +03:00
Christopher Dunn
9a048e5766 Merge pull request #637 from ssbr/fix-owners 
Restore BL's authorship attribution, and add "The Jsoncpp Authors" where it was missing
 2017-07-30 21:43:25 -05:00
Devin Jeanpierre
59e4d35339 Restore BL's authorship attribution, and add "The Jsoncpp Authors" where it was missing. 
Requested/noticed in https://github.com/open-source-parsers/jsoncpp/pull/610, and a
followup to https://github.com/open-source-parsers/jsoncpp/pull/607 .
 2017-07-21 03:44:36 -07:00
Christopher Dunn
f26edb05e5 Merge pull request #630 from jschueller/appveyor 
Fix shared/static lib build conflict

resolves #631
 2017-07-16 17:18:24 -05:00
Billy Donahue
cadb6dd9a6 Merge pull request #636 from pavel-pimenov/fix-strstr 
strstr -> strchr
 2017-07-13 11:23:04 -04:00
pavel.pimenov
ea9f0cec30 strstr -> strchr 
https://www.viva64.com/en/w/V817/print/
 2017-07-13 14:21:53 +03:00
Julien Schueller
ffdcc9355d Avoid import/static libs name clash 2017-07-13 09:03:35 +02:00
Julien Schueller
f45c01a46e Enable shared libs on appveyor 2017-07-12 17:36:23 +02:00
Julien Schueller
3c2069fdd1 Cleanup appveyor script 2017-07-12 17:35:22 +02:00
Christopher Dunn
414b179d86 Merge pull request #635 from Dark-Passenger/master 
Add move assignment operator for Json::Value class and overload append member function for RValue references

resolves #621
 2017-07-11 16:08:36 -05:00
Dhruv Paranjape
0ba8bd73f5 add move assignment operator for CZString and change copy assignment to const reference. 2017-07-08 17:47:13 +05:30
Dhruv Paranjape
23c44d9f9e overload append function for R value references. 2017-07-08 17:30:47 +05:30
Dhruv Paranjape
8996c377aa add move assignment operator for Json::Value class. 2017-07-08 17:27:07 +05:30
Christopher Dunn
a679dde58d 1.8.1 1.8.1 2017-06-25 22:01:22 -07:00
Christopher Dunn
c21b4bbfdb Merge pull request #625 from SoapGentoo/mesonise 
Add initial Meson build file
 2017-06-25 21:51:15 -07:00
David Seifert
d14d8c35c3 Update Travis configuration 2017-06-26 06:12:05 +02:00
David Seifert
ed258de63d Add initial Meson build file 2017-06-26 06:12:05 +02:00
Christopher Dunn
154652ee7a Merge pull request #623 from bernhardHartleb/master 
Fix #567 in writing real values in different locales
 2017-06-24 10:34:14 -07:00
Bernhard Hartleb
4a9d77bcf7 Fix issue #567 in writing real values in different locales 
The output of snprintf might produce ',' separators for decimal places if
certain locales are set. This commit moves the converversion from ',' to '.'
to correct place. Otherwise an additional ".0" might be appended.
 2017-06-22 22:46:16 +02:00
Christopher Dunn
56efb6ba83 Merge pull request #622 from sylvestre/master 
Allocate the proper memory for formatString. Fix a warning with gcc 7.1
 2017-06-12 19:44:58 -05:00
Sylvestre Ledru
7f9cc2705c Allocate the proper memory for formatString. Fix a warning with gcc 7.1 
/root/firefox-gcc-last/toolkit/components/jsoncpp/src/lib_json/json_writer.cpp:139:16: note: using the range [-2147483648, 2147483647] for directive argument
/root/firefox-gcc-last/toolkit/components/jsoncpp/src/lib_json/json_writer.cpp:146:10: note: 'sprintf' output between 5 and 15 bytes into a destination of size 6
   sprintf(formatString, "%%.%dg", precision);
   ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 2017-06-09 22:41:48 +02:00
Christopher Dunn
d7347a2623 Merge pull request #609 from antonindrawan/QNX_Fix 
Fix QNX build: QNX defines sprintf under the std namespace.
 2017-05-01 21:52:55 -05:00
Anton Indrawan
2e319850d1 Fix QNX build: QNX defines sprintf under the std namespace. Use snprintf instead 2017-05-01 23:14:23 +02:00
Christopher Dunn
a3d35d7fb8 Merge pull request #607 from ssbr/master 
Refactor authorship information for more technical accuracy.
 2017-04-25 00:51:37 -05:00
Devin Jeanpierre
19fc55f408 Refactor authorship information for more technical accuracy. 
Google advises its employees to add Google Inc. as an author, but that hasn't
been done yet and would be super inconvenient. So instead I've refactored the
file to refer to "The JsonCpp Authors", which are listed in the AUTHORS file.

The AUTHORS file itself is generated via:

    git log --pretty="%an <%ae>%n%cn <%ce>" | sort | uniq

Plus the addition of "Google Inc." as a copyright author. (Google owns the work
of anyone contributing from an @google.com address, for example.)

The list contains some probable duplicates where people have used more than one
email address. I didn't deduplicate because -- well, who's to say they're
duplicates, anyway? :)
 2017-04-24 11:01:12 -07:00