Commit Graph

  • ba68da9c42
    Merge branch 'master' into jsoncpp_version Chen 2020-12-01 09:13:02 +0800
  • 6515246e2d fix the CI failure Chen 2020-11-16 11:34:12 +0800
  • d6152a06ea Revert to JSONCPP_(SO)?VERSION_* Jordan Bayles 2020-11-09 09:47:18 -0800
  • ed52338118
    Remove trailing space characters Aaron Franke 2020-09-14 20:51:25 -0400
  • 82da440ea1 Merge branch 'pvs-studio-fix-05-09-2020' of https://github.com/pavel-pimenov/jsoncpp into pvs-studio-fix-05-09-2020 Pave Pimenov 2020-11-07 22:07:17 +0300
  • 5cde655253 * fix ToJsonString Pave Pimenov 2020-11-07 22:06:49 +0300
  • 0ebc82804f
    Merge branch 'master' into pvs-studio-fix-05-09-2020 Pavel Pimenov 2020-11-07 22:03:40 +0300
  • b587b9c8ad
    appveyor: add verbose output to see warnings Rosen Penev 2020-04-12 16:26:38 -0700
  • 8928bac9fc
    move _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES up Rosen Penev 2020-04-12 16:21:49 -0700
  • 9e6328e4c3
    json_writer: remove isnan/isfinite compatibility Rosen Penev 2020-04-11 22:33:44 -0700
  • ab0daa5ad7
    remove auto_ptr compatibility Rosen Penev 2020-04-11 22:22:14 -0700
  • 306a7704e0
    json_writer: remove old pre-C++11 compability stuff Rosen Penev 2020-04-11 20:38:01 -0700
  • 187cb57603
    remove unused sscanf define Rosen Penev 2020-04-11 20:29:55 -0700
  • 8954092f0a
    ENH: Prevent cmake in source builds (#1091) Hans Johnson 2020-11-06 15:35:51 -0600
  • 53a042360b
    Merge branch 'master' into prevent-in-source-builds Jordan Bayles 2020-11-06 13:34:56 -0800
  • ab01a90aaf
    Merge branch 'master' into jsoncpp_version Jordan Bayles 2020-11-06 13:22:44 -0800
  • ceae0e3867
    Fix clang-tidy warnings (#1231) Marcel Opprecht 2020-11-06 22:22:26 +0100
  • 5b3f428582 v3 Jordan Bayles 2020-11-06 12:28:02 -0800
  • c212bb1a3e Appveyor variable fix attempt #2' Jordan Bayles 2020-11-06 12:20:08 -0800
  • e2c0fecd20 Fix cmake path Jordan Bayles 2020-11-06 12:10:43 -0800
  • c3f039d1c2
    Merge branch 'master' into bug/fix-clang-tidy-warnings Jordan Bayles 2020-11-06 11:58:42 -0800
  • dfe281e00c Fixup/clang-format Jordan Bayles 2020-11-06 11:58:25 -0800
  • f321cd0388 Merge branch 'master' into prevent-in-source-builds Jordan Bayles 2020-11-06 11:53:58 -0800
  • 7472a68863 Fix appveyor Jordan Bayles 2020-11-06 11:53:56 -0800
  • f93e88d0c4 Change rest of JSONCPP_VERSION_* instances Jordan Bayles 2020-11-06 11:39:37 -0800
  • a32ceec45a fix empty version string in pkgconfig/jsoncpp.pc Chen 2020-11-04 10:09:14 +0800
  • 30170d651c Fix c++20 compilation problem for clang10 and fix potential bug due to compiler optimization Christian Ledergerber 2020-10-13 17:55:58 +0200
  • 8a923cb0d6 Fix c++20 compilation problem for clang10 and fix potential bug due to compiler optimization Christian Ledergerber 2020-10-13 17:55:58 +0200
  • ed4a017e1e remove example/vs2017 and fix bug #1215 gaozilai 2020-10-14 10:11:04 +0800
  • 3be571f01d remove example/vs2017 and fix bug #1215 gaozilai 2020-10-14 10:10:36 +0800
  • 963aec7a19 Fix clang-tidy warnings Marcel Opprecht 2020-10-13 09:59:56 +0200
  • 44bd0a4173 Merge branch 'master' of github.com:gaozilai/jsoncpp into master gaozilai 2020-10-12 16:43:45 +0800
  • 9ef618d786 Merge branch 'master' of github.com:gaozilai/jsoncpp into master gaozilai 2020-10-12 16:37:50 +0800
  • 1627382322 Merge branch 'master' of github.com:gaozilai/jsoncpp into master gaozilai 2020-10-12 16:37:50 +0800
  • a895bb25ac Add example code of Visual Studio 2017 on windows OS. gaozilai 2020-10-12 16:31:28 +0800
  • 97925263f5 Add example code of Visual Studio 2017 on windows OS. gaozilai 2020-10-12 16:31:28 +0800
  • 5f4e10462f
    Merge pull request #1229 from open-source-parsers/pypi Christopher Dunn 2020-10-10 11:30:19 -0500
  • bb9db78fe2 Do not allow failures on osx Christopher Dunn 2020-10-10 11:20:19 -0500
  • 1664b6bbf8 Try meson/ninja from pypi Christopher Dunn 2020-10-10 09:06:43 -0500
  • 5d1cb30e40 clang-format Christopher Dunn 2020-10-10 10:29:19 -0500
  • c60ebf787a test: ensure the version numbers agree Ben Boeckel 2020-10-01 12:22:04 -0400
  • 72db276986 version.h: fix the version number in the header Ben Boeckel 2020-10-01 12:21:48 -0400
  • f8cc724d6a test: ensure the version numbers agree Ben Boeckel 2020-10-01 12:22:04 -0400
  • f356429532 version.h: fix the version number in the header Ben Boeckel 2020-10-01 12:21:48 -0400
  • 9059f5cad0
    Roll version numbers for 1.9.4 release (#1223) 1.9.4 Jordan Bayles 2020-09-25 19:19:16 -0700
  • 4cb9cd6d5b Roll version numbers for 1.9.4 release Jordan Bayles 2020-09-25 19:18:41 -0700
  • 06dee56f20 Revert "Remove volatile keyword from function argument" Troels Dalsgaard Hoffmeyer 2020-09-25 10:50:00 +0200
  • a9025c7538 #1209 add parseFromString to avoid unnecessary stringstream content copy Fedor Moiseev 2020-09-16 13:14:42 +0200
  • fb4986688f Use reintepret_cast instead of c style cast for const char* Troels Dalsgaard Hoffmeyer 2020-09-15 10:05:17 +0200
  • 319842ebb0 Remove unnecessary type specification Troels Dalsgaard Hoffmeyer 2020-09-14 16:55:45 +0200
  • e9b24028d3 u8 literal returns a char8_t in C++20 Troels Dalsgaard Hoffmeyer 2020-09-14 16:46:27 +0200
  • bd16ebaee8 Revert "Fix string assignment in test" Troels Dalsgaard Hoffmeyer 2020-09-14 16:30:06 +0200
  • db58df22c6 Revert "Use pure utf-8 string in assignemnt" Troels Dalsgaard Hoffmeyer 2020-09-14 16:29:50 +0200
  • b24b7cfadf * revert Pave Pimenov 2020-09-08 19:29:10 +0300
  • 32457a772e * PVS Studio fix http://oracle.fly-server.ru/pvs-studio/jsoncpp/ Pave Pimenov 2020-09-05 16:09:19 +0300
  • 986ef4a93b Got a compiler warning on -> in reverse_iterator. Troels Dalsgaard Hoffmeyer 2020-09-04 16:07:01 +0200
  • 1aa5e0ea25 Remove volatile keyword from function argument Troels Dalsgaard Hoffmeyer 2020-09-04 15:55:23 +0200
  • 1943a54582 Use pure utf-8 string in assignemnt Troels Dalsgaard Hoffmeyer 2020-09-04 15:54:00 +0200
  • 70fa051681 Fix deprecated capture of "this" in lambda Troels Dalsgaard Hoffmeyer 2020-09-04 15:23:56 +0200
  • c4fd81669f Fix string assignment in test Troels Dalsgaard Hoffmeyer 2020-09-04 15:21:08 +0200
  • 45733df96c meson: Don't specifically look for python3 Daniel Engberg 2020-06-03 12:19:51 +0200
  • c829c73d4e fix inconsistency when build both shared/static lib Chenguoping 2020-09-02 11:20:03 +0800
  • 8a1ad08974 include/json: check MSVC before adding pragma warning directive Biswapriyo Nath 2020-08-20 11:06:57 +0530
  • a15fc7ba88 Add support to build shared, static and object lib at the same time chenguoping 2020-07-22 10:04:12 +0800
  • 5be07bdc5e
    Fix generation of pkg-config file with absolute includedir/libdir. (#1199) Ben Wolsieffer 2020-07-20 08:36:30 -0400
  • 789f29e301 Fix generation of pkg-config file with absolute includedir/libdir. Ben Wolsieffer 2020-07-05 13:49:18 -0400
  • 6d412f88c7 historic_map container to keep subvalues in order of insertion (#1202) Fedor Moiseev 2020-07-14 15:22:52 +0200
  • bf0cfa5b46
    hot fix for building static lib (#1203) Chen 2020-07-14 16:37:22 +0800
  • 9d2676a46b hot fix for building static lib chenguoping 2020-07-14 16:08:01 +0800
  • cfc1ad72ad
    Enhance cmake script (#1197) Chen 2020-07-13 20:33:58 +0800
  • fa1ae11a85 Issue 1182: Fix fuzzing bug (#1183) Jordan Bayles 2020-05-30 20:20:20 -0700
  • 3228be44b0 Fixes Oss-Fuzz issue: 21916 (#1180) kabeer27 2020-05-29 19:20:26 +0530
  • 1d38f0d6b4 Added current dir specifier for PowerShell (#1169) Edward Brey 2020-05-07 20:00:12 -0500
  • 7b8ec814de Add support to build shared, static and object lib at the same time. chenguoping 2020-06-30 16:15:18 +0800
  • 9ff14301d4 BUILD_TYPE corresponds to Release/Debug but LIB_TYPE corresponds to shared/static. chenguoping 2020-06-30 15:37:13 +0800
  • c8453d39d1
    Delete nullptr Json::Value constructor (#1194) nathanruiz 2020-06-24 07:52:28 +1000
  • d76836771f Delete nullptr Json::Value constructor Nathan Ruiz 2020-06-18 09:55:39 +1000
  • 632044ad95
    Billy donahue avoid isprint (#1191) Billy Donahue 2020-06-11 18:14:03 -0400
  • a74ceb43ff
    Windows tab escape testing with custom locale (#1190) Nikolay Baklicharov 2020-06-12 01:09:50 +0300
  • b3189a0800
    avoid isprint, because it is locale specific (#1189) Billy Donahue 2020-06-11 17:43:44 -0400
  • 56fa945d46 Windows tab escape testing with custom locale Nikolay Baklicharov 2020-06-12 00:29:44 +0300
  • b395975b6c
    semicolon (rookie mistake!) Billy Donahue 2020-06-10 16:48:50 -0400
  • 1806274a27
    avoid isprint Billy Donahue 2020-06-10 16:22:07 -0400
  • 5ff13f7598 meson: Don't specifically look for python3 Daniel Engberg 2020-06-03 12:19:51 +0200
  • 9be5895985
    Issue 1182: Fix fuzzing bug (#1183) Jordan Bayles 2020-05-30 20:20:20 -0700
  • 09d44a1326 Issue 1182: Fix fuzzing bug Jordan Bayles 2020-05-29 17:36:21 -0700
  • 6aba23f4a8
    Fixes Oss-Fuzz issue: 21916 (#1180) 1.9.3 kabeer27 2020-05-29 19:20:26 +0530
  • 90cc4b991b Fix heap-buffer-overflow in json_reader kabeer27 2020-05-29 01:15:53 +0530
  • 0647d1f18f undo kabeer27 2020-05-29 01:12:53 +0530
  • b1de73fc44 Fixing heap byte overflow kabeer27 2020-05-28 21:05:42 +0530
  • c161f4ac69
    Escape control chars even if emitting UTF8 (#1178) Billy Donahue 2020-05-21 11:30:59 -0400
  • 0b6a3a5797 fix test by stopping early enough to punt on utf8-input. Billy Donahue 2020-05-21 06:21:20 -0400
  • c1583225d1 review comments Billy Donahue 2020-05-21 05:43:31 -0400
  • 0c6deca542 Code-review fixes 3 Nikolay Baklicharov 2020-05-21 11:32:36 +0300
  • a632154472 Escape control chars even if emitting UTF8 Billy Donahue 2020-05-20 20:34:43 -0400
  • 8a1417e27b Code-review fixes 2 Nikolay Baklicharov 2020-05-21 02:48:38 +0300
  • d268648c52 Code-review fixes Nikolay Baklicharov 2020-05-20 17:50:17 +0300
  • 1d6e8a8c2c
    fix compile error : anonymous struct (#1177) Chen 2020-05-20 18:59:58 +0800
  • 347ac38d97 fix compile error : anonymous struct chenguoping 2020-05-20 16:18:01 +0800
  • 6973244664 Fixed control chars escaping with enabled emitUTF8 Nikolay Baklicharov 2020-05-19 16:14:22 +0300