Commit Graph

  • dfdbbc71bb Merge branch 'develop' of https://github.com/nlohmann/json into bon8 Niels Lohmann 2022-06-18 21:19:48 +02:00
  • 87cda1d664 Use std::iterator_traits to extract iterator_category (#3544) 郑少锟 2022-06-19 01:14:03 +08:00
  • 13730235f2 BJData dimension length can not be string_t::npos, fix #3541 (#3543) Qianqian Fang 2022-06-18 13:12:22 -04:00
  • f6acdbec2c Allow disabling default enum conversions (#3536) Richard Hozák 2022-06-16 19:34:32 +02:00
  • e80945da2c CI: Enable 32bit unit test (3) (#3532) Florian Albrechtskirchinger 2022-06-14 08:54:12 +02:00
  • 9c31d54389 Add to_json() for std::vector<bool>::reference (#3534) Florian Albrechtskirchinger 2022-06-13 13:21:55 +02:00
  • af34396129 Use new CI image (#3528) Niels Lohmann 2022-06-12 14:31:07 +02:00
  • 48a102c2c5 Fix ndarray dimension signedness, fix ndarray length overflow (2); add 32bit unit test (#3523) Florian Albrechtskirchinger 2022-06-09 08:22:58 +02:00
  • b6d00d1897 Small documentation fixes (#3520) Niels Lohmann 2022-06-06 16:46:55 +02:00
  • 7c65b5cdbd Update json.hpp (#3499) ivanovmp 2022-06-06 14:01:46 +03:00
  • 7a6e28acfa Add assertion to converting constructor (#3517) Florian Albrechtskirchinger 2022-06-03 21:05:44 +02:00
  • 560cede06d CI: Remove -Wstrict-overflow (#3516) Florian Albrechtskirchinger 2022-06-03 20:39:24 +02:00
  • 6058d9a8b3 Add more macOS builders (#3485) Niels Lohmann 2022-06-03 14:03:14 +02:00
  • 046927cc29 Fix nlohmann/json#3513, explain is_ndarray flag (#3514) Qianqian Fang 2022-06-03 02:51:33 -04:00
  • 6b97599a27 Fix C++20/gcc-12 issues (Part 2) (#3446) Florian Albrechtskirchinger 2022-05-29 13:08:06 +02:00
  • ede6667858 Prevent ndarray size vector from recursive use, fix nlohmann/json#3503 (#3505) Qianqian Fang 2022-05-23 00:07:22 -04:00
  • 41226d0a03 prevent ndarray dimension vector from recusive array, nlohmann/json#3500 (#3502) Qianqian Fang 2022-05-20 03:41:51 -04:00
  • 6ff2ea3aed 🥅 add assertion for invariant in SAX-DOM parser (#3498) Niels Lohmann 2022-05-19 19:56:33 +02:00
  • 93c9e0c703 Discard optimized containers with negative counts in UBJSON/BJData (#3491,#3492,#3490) (#3500) Qianqian Fang 2022-05-18 12:38:15 -04:00
  • 6a7392058e Complete documentation for 3.11.0 (#3464) Niels Lohmann 2022-05-17 13:08:56 +02:00
  • a8a547d7a2 change bjdata ndarray flag to detect negative size, as part of #3475 (#3479) Qianqian Fang 2022-05-10 15:13:24 -04:00
  • d6efe672b5 Document fuzzer usage (#3478) Niels Lohmann 2022-05-09 08:02:41 +02:00
  • ad662d15bc 🎨 fix indendation Niels Lohmann 2022-05-02 07:10:03 +02:00
  • b1e3165712 🚨 fix warnings Niels Lohmann 2022-05-01 22:50:40 +02:00
  • b205361d86 Handle invalid BJData optimized type, fix #3461 (#3463) Qianqian Fang 2022-05-01 16:47:06 -04:00
  • bdc21ad1a7 Add build step for ICPC (with fixes) (#3465) Florian Albrechtskirchinger 2022-05-01 22:46:45 +02:00
  • a1e116f015 complete test suite Niels Lohmann 2022-05-01 20:50:09 +02:00
  • 5927ddc3b2 🚨 fix warnings Niels Lohmann 2022-05-01 20:08:44 +02:00
  • 4ada06d860 🔀 merge develop Niels Lohmann 2022-05-01 20:01:10 +02:00
  • 88fbbd3aa8 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 Niels Lohmann 2022-05-01 18:46:44 +02:00
  • 0c698b75cc Add serve_header.py for rapid testing on Compiler Explorer (#3456) Florian Albrechtskirchinger 2022-05-01 13:52:52 +02:00
  • b21c345179 Reorganize directories (#3462) Niels Lohmann 2022-05-01 09:41:50 +02:00
  • 5352856f04 Implement support for string_view (attempt no. 3) (#3423) Florian Albrechtskirchinger 2022-04-29 21:40:02 +02:00
  • ee51661481 Support UBJSON-derived Binary JData (BJData) format (#3336) Qianqian Fang 2022-04-29 15:17:30 -04:00
  • a6ee8bf9d9 Overwork documentation (#3444) Niels Lohmann 2022-04-25 22:40:45 +02:00
  • fcc36f99ba ⬆️ cpplint 1.6.0 (#3454) Niels Lohmann 2022-04-24 17:22:04 +02:00
  • 1a90c9463a Disable regression test for #3070 on GCC <8.4 (#3451) Florian Albrechtskirchinger 2022-04-22 14:21:16 +02:00
  • a94430615d Fix typo in basic_json documentation (#3439) JungHoon Lee 2022-04-12 22:58:06 +09:00
  • 616caea27a Re-template json_pointer on string type (#3415) Florian Albrechtskirchinger 2022-04-12 14:18:16 +02:00
  • 1deeb434c6 Exclude std::any from implicit conversion (fixes #3428) (#3437) Florian Albrechtskirchinger 2022-04-12 14:08:20 +02:00
  • 10344907ff 📝 document which version introduced the macros #3429 (#3431) Niels Lohmann 2022-04-09 18:09:23 +02:00
  • 261cc4e509 Fix constraints on from_json() for strings (#3427) Florian Albrechtskirchinger 2022-04-08 10:22:47 +02:00
  • 15fa6a342a at.md: fix typo (#3426) Michael Nosthoff 2022-04-06 15:26:35 +02:00
  • 448b173ccf Update CI image (#3420) Niels Lohmann 2022-04-06 15:14:14 +02:00
  • 52e16a9f9c 🚸 add check if different version is also included #3337 (#3418) Niels Lohmann 2022-04-06 08:29:01 +02:00
  • fa91409a73 CI: speedup AppVeyor builds by ~30% (#3422) Florian Albrechtskirchinger 2022-04-06 08:26:49 +02:00
  • c2054b96b9 Restore disabled check for #3070 (except on MSVC) (#3421) Florian Albrechtskirchinger 2022-04-06 08:25:35 +02:00
  • ab5cecb34f Report the right __cplusplus value for MSVC in basic_json meta() (#3417) flagarde 2022-04-05 02:45:19 +08:00
  • 33b75e513a CI: windows-2016 has been deprecated; remove jobs (#3416) Florian Albrechtskirchinger 2022-04-04 13:18:00 +02:00
  • 6121dbbe02 Avoid clash with Arduino defines (#3338) DarkZeros 2022-04-03 17:33:33 +01:00
  • 3b16057ffa Refactor unit tests to use more convenient doctest assertion macros (Part 2) (#3405) Krzysiek Karbowiak 2022-04-01 14:38:17 +02:00
  • 66f6b4b6a0 🔧 overwork issue template #3348 Niels Lohmann 2022-03-25 10:16:21 +01:00
  • 1ba736893e 🔧 overwork issue template #3348 Niels Lohmann 2022-03-25 10:12:33 +01:00
  • f7490e33da 🔧 overwork issue template #3348 Niels Lohmann 2022-03-25 10:10:21 +01:00
  • ce35256825 Refactor unit tests to use more convenient doctest assertion macros (#3393) Krzysiek Karbowiak 2022-03-24 15:55:35 +01:00
  • ad103e5b45 Improve unit testing (Part 1) (#3380) Florian Albrechtskirchinger 2022-03-24 07:54:07 +01:00
  • 700b95f447 Make iterator operator++/--(int) equality-preserving (#3332) Florian Albrechtskirchinger 2022-03-08 10:10:50 +01:00
  • f208a9c19b Fix C++20/gcc-12 issues (Part 1) (#3379) Florian Albrechtskirchinger 2022-03-07 22:19:28 +01:00
  • 4a6e6ca8c7 📝 update documentation Niels Lohmann 2022-03-07 13:48:24 +01:00
  • 8d7b5b6a28 Add clarification to avoid misunderstanding that cause #3360 (#3378) Andrea Cocito 2022-03-07 13:43:50 +01:00
  • 0fd95d2e28 Fix ordered_map ctor with initializer_list (#3370) Florian Albrechtskirchinger 2022-03-07 13:41:35 +01:00
  • c6d8892e5d FetchContent_MakeAvailable (#3351) Niels Lohmann 2022-03-06 15:33:05 +01:00
  • d1e57df48b Fix and update CI (#3368) Florian Albrechtskirchinger 2022-03-06 13:54:00 +01:00
  • e4643d1f1b Fix CITATION.cff and add automatic validation of your citation metadata (#3320) Faruk D 2022-02-18 18:11:44 +01:00
  • d8a63291cb 📝 add note on parsing ordered_json #3325 (#3326) Niels Lohmann 2022-02-12 15:45:51 +01:00
  • eb21824147 📝 replace Doxygen links Niels Lohmann 2022-02-08 22:12:49 +01:00
  • eec79d4e8a Add macros NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and ..._NON_INTRUSIVE_WITH_DEFAULT (#3143) pketelsen 2022-01-30 22:06:50 +01:00
  • c11f98228d 📝 document FetchContent Niels Lohmann 2022-01-30 13:05:18 +01:00
  • 4d4c273036 .github/workflows/windows.yml: Add support for Visual Studio 2022 (#3295) Thomas Braun 2022-01-26 09:57:23 +01:00
  • b772649624 Add maintainer targets to create source archive (#3289) Niels Lohmann 2022-01-25 19:53:02 +01:00
  • 293f67f9ff Fix a typo (#3265) Ferry Huberts 2022-01-12 21:43:22 +01:00
  • c6740d7d58 📝 add documentation for default behavior for macros Niels Lohmann 2022-01-11 21:46:40 +01:00
  • ef556019be 📝 overwork documentation Niels Lohmann 2022-01-09 14:32:38 +01:00
  • 6d8d043add ♻️ make function static Niels Lohmann 2022-01-05 21:21:46 +01:00
  • 4b6220acf2 ✏️ fix typo Niels Lohmann 2022-01-05 21:18:27 +01:00
  • b785783440 Fix typo (#3249) Dimitris Apostolou 2022-01-05 14:35:14 +02:00
  • 6cd68ebd12 📝 add documentation for JSON Lines (#3247) Niels Lohmann 2022-01-05 09:51:29 +01:00
  • 4fc7b3dc7c 🔧 adjust docset generation script Niels Lohmann 2022-01-04 15:20:50 +01:00
  • a8e86ba948 📝 improve documentation InputType and IteratorType (#3246) Niels Lohmann 2022-01-04 15:02:39 +01:00
  • 9e89c2fdb5 ♻️ remove stringstream (#3244) Niels Lohmann 2022-01-04 09:25:41 +01:00
  • 78ddf2bcf8 fix _MSC_VER version to check for std::filesystem (#3240) Giovanni Cerretani 2022-01-03 13:57:51 +01:00
  • cc59ab122f Merge branch 'release/3.10.5' into develop Niels Lohmann 2022-01-03 06:40:28 +01:00
  • 4f8fba1406 Merge branch 'release/3.10.5' v3.10.5 Niels Lohmann 2022-01-03 06:40:09 +01:00
  • b5364faf9d 🔖 set version to 3.10.5 Niels Lohmann 2022-01-02 22:35:35 +01:00
  • b69713c394 Fix compilation error with NVCC (#3234) Niels Lohmann 2022-01-02 09:03:56 +01:00
  • 9105f5514e 🔀 merge develop branch Niels Lohmann 2021-12-31 14:57:35 +01:00
  • 9dfe422e65 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 Niels Lohmann 2021-12-31 14:53:13 +01:00
  • 926df56ddb 🔥 remove Travis CI #3087 (#3233) Niels Lohmann 2021-12-31 11:04:29 +01:00
  • 1aca6cb949 Add build step for NVCC and fix a warning (#3227) Niels Lohmann 2021-12-30 13:40:15 +01:00
  • e6bf789f7d ⬆️ update cpplint (#3225) Niels Lohmann 2021-12-29 20:20:15 +01:00
  • 29cd970b94 Consolidate documentation (#3071) Niels Lohmann 2021-12-29 13:41:01 +01:00
  • 6d3115924c Add C++17 copies of the test binaries (#3101) Niels Lohmann 2021-12-29 09:47:05 +01:00
  • 825d3230d1 Fix: Warning for shadowed variables (#3188) (#3193) Maarten Becker 2021-12-17 07:24:59 +01:00
  • 760304635d Fix FAQ hyperlink typo in readme (#3148) Prince Mendiratta 2021-11-18 16:28:49 +05:30
  • ee1208aa60 Docs: Update skip_comments to ignore_comments (#3145) Daniel Albuschat 2021-11-17 19:21:54 +01:00
  • fe230334d9 fix typos in documentation (#3140) Dirk Stolle 2021-11-14 14:25:14 +01:00
  • e9f88c2fad Add missing erase(first, last) function to ordered_map (#3109) Niels Lohmann 2021-11-09 22:24:58 +01:00
  • 834918018e Fix spelling (#3125) Alex Beregszaszi 2021-11-09 13:46:58 +00:00
  • 5c08a52fd6 ♻️ overwork std specializations (#3121) Niels Lohmann 2021-11-04 16:38:40 +01:00
  • 5d87c4d409 Add recursive update function (#3069) Niels Lohmann 2021-11-03 13:52:20 +01:00