starred/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-24 06:10:22 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity
4,450 Commits 43 Branches 57 Tags
f2020da0dd36ddf1e023eada2f5ad2f70dd7cc76
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann f2020da0dd 🔖 set version to 3.11.1 2022-08-01 23:27:58 +02:00
Niels Lohmann 817a4a2117 Merge tag 'v3.11.0' into develop 
JSON for Modern C++ 3.11.0
 2022-08-01 13:15:38 +02:00
Niels Lohmann 499422b303 Merge branch 'release/3.11.0' 2022-08-01 13:12:06 +02:00
Niels Lohmann ce0e13ccea 🔖 set version to 3.11.0 2022-07-31 23:19:06 +02:00
Niels LohmannandFlorian Albrechtskirchinger 8fd8b52907 Prepare 3.11.0 release (#3635) 
* 📄 add license header

* Update Makefile

Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>

* 🔥 remove unused Doxygen leftover

Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-07-31 15:28:01 +02:00
Niels Lohmann 11ba5c1120 🚨 fix warning (#3634) 2022-07-31 07:23:30 +02:00
Niels Lohmann 9472ab4f84 Add license header to new files (#3633) 2022-07-31 07:22:22 +02:00
Niels Lohmann d1d79b930d Adjust JSON Pointer examples (#3622) 
* 📝 adjust JSON Pointer examples

* 👷 add test for documentation

* 📝 note platform-dependent output on some examples
 2022-07-29 14:28:37 +02:00
Niels LohmannandFlorian Albrechtskirchinger 2d48a4d9c5 Add documentation for comparing json and ordered_json (#3599) 
* 📝 add documentation for #3443

* Apply suggestions from code review

Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-07-23 20:54:40 +02:00
Niels Lohmann dbfd33a70a Add assertion if nullptr is passed to parse function (#3593) 
Addresses #3584
 2022-07-23 01:26:51 +02:00
Niels Lohmann b185c5bc9d 📝 clean up after #3581 (#3596) 2022-07-22 15:35:29 +02:00
Niels Lohmann 4b6d3638ca 📝 minor fixes (#3592) 2022-07-20 18:59:04 +02:00
Niels Lohmann feef0eb595 Add error message if test suite cannot be found (#3585) 
* 🚸 add error message if test suite cannot be found

Fixes #3584
 2022-07-20 12:41:33 +02:00
Niels LohmannandFlorian Albrechtskirchinger 527da54dcb Use REUSE framework (#3546) 
* 📄 add licenses

* 👷 add REUSE compliance check

* 📝 add badge for REUSE

Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-07-20 12:38:07 +02:00
Niels Lohmann a15683e348 📝 add badge for https://repology.org/project/nlohmann-json/versions (#3586) 2022-07-18 17:48:42 +02:00
Niels Lohmann af34396129 Use new CI image (#3528) 
* ⬆️ use new CI image

* ⬆️ use new CI image

* 🚨 fix warning

* 🔧 remove duplicate warning flags

* 💚 fix test

* 📝 update compiler versions
 2022-06-12 14:31:07 +02:00
Niels Lohmann b6d00d1897 Small documentation fixes (#3520) 2022-06-06 16:46:55 +02:00
Niels Lohmann 6058d9a8b3 Add more macOS builders (#3485) 
* 👷 add more macOS builders

* 👷 add more macOS builders

* 💚 fix macOS build

* 📝 document new Xcode versions
 2022-06-03 14:03:14 +02:00
Niels Lohmann 6ff2ea3aed 🥅 add assertion for invariant in SAX-DOM parser (#3498) 2022-05-19 19:56:33 +02:00
Niels LohmannChaoqi ZhangQianqian Fang
 		6a7392058e Complete documentation for 3.11.0 (#3464) 
* 👥 update contributor and sponsor list

* 🚧 document BJData format

* 🚧 document BJData format

* 📝 clarified documentation of [json.exception.parse_error.112]

* ✏️ adjust titles

* 📝 add more examples

* 🚨 adjust warnings for index.md files

* 📝 add more examples

* 🔥 remove example for deprecated code

* 📝 add missing enum entry

* 📝 overwork table for binary formats

* ✅ add test to create table for binary formats

* 📝 fix wording in example

* 📝 add more examples

* Update iterators.md (#3481)

* ✨ add check for overloads to linter #3455

* 👥 update contributor list

* 📝 add more examples

* 📝 fix documentation

* 📝 add more examples

* 🎨 fix indentation

* 🔥 remove example for destructor

* 📝 overwork documentation

* Updated BJData documentation, #3464 (#3493)

* update bjdata.md for #3464

* Minor edit

* Fix URL typo

* Add info on demoting ND array to a 1-D optimized array when singleton dimension

Co-authored-by: Chaoqi Zhang <prncoprs@163.com>
Co-authored-by: Qianqian Fang <fangqq@gmail.com>
 2022-05-17 13:08:56 +02:00
Niels Lohmann d6efe672b5 Document fuzzer usage (#3478) 
* 📝 document fuzzer usage

* 📝 address review comments
 2022-05-09 08:02:41 +02:00
Niels Lohmann b21c345179 Reorganize directories (#3462) 
* 🚚 move files
* 🚚 rename doc folder to docs
* 🚚 rename test folder to tests
 2022-05-01 09:41:50 +02:00
Niels Lohmann a6ee8bf9d9 Overwork documentation (#3444) 
* 📝 overwork macro documentation

* 📝 address review comments

* 🔧 add style check to Makefile

* 🙈 overwork .gitignore

* 📌 Pygments 2.12.0 is broken

* ✏️ fix links

* 🚸 adjust output to cppcheck

* 📝 add titles to more admonitions

* ✏️ fix typos

* 📝 document future behavior change
 2022-04-25 22:40:45 +02:00
Niels Lohmann fcc36f99ba ⬆️ cpplint 1.6.0 (#3454) 2022-04-24 17:22:04 +02:00
Niels Lohmann 10344907ff 📝 document which version introduced the macros #3429 (#3431) 2022-04-09 18:09:23 +02:00
Niels Lohmann 448b173ccf Update CI image (#3420) 
* ⬆️ use new CI image

* ⬆️ use new CI image

* 🚨 suppress Clang-Tidy warnings

* 💚 use proper scan-build version

* 🚨 suppress Clang-Tidy warnings

* ⬆️ use more recent GitHub actions

* 💚 add missing compiler

* 📝 update used compilers

* 🚨 fix duplicate inclusion
 2022-04-06 15:14:14 +02:00
Niels Lohmann 52e16a9f9c 🚸 add check if different version is also included #3337 (#3418) 2022-04-06 08:29:01 +02:00
Niels Lohmann 66f6b4b6a0 🔧 overwork issue template #3348 2022-03-25 10:16:21 +01:00
Niels Lohmann 1ba736893e 🔧 overwork issue template #3348 2022-03-25 10:12:33 +01:00
Niels Lohmann f7490e33da 🔧 overwork issue template #3348 2022-03-25 10:10:21 +01:00
Niels Lohmann 4a6e6ca8c7 📝 update documentation 2022-03-07 13:48:24 +01:00
Niels Lohmann c6d8892e5d FetchContent_MakeAvailable (#3351) 
* 🔧 use FetchContent_MakeAvailable

* 💚 fix test names
 2022-03-06 15:33:05 +01:00
Niels Lohmann d8a63291cb 📝 add note on parsing ordered_json #3325 (#3326) 2022-02-12 15:45:51 +01:00
Niels Lohmann eb21824147 📝 replace Doxygen links 2022-02-08 22:12:49 +01:00
Niels Lohmann c11f98228d 📝 document FetchContent 2022-01-30 13:05:18 +01:00
Niels Lohmann c6740d7d58 📝 add documentation for default behavior for macros 2022-01-11 21:46:40 +01:00
Niels Lohmann ef556019be 📝 overwork documentation 2022-01-09 14:32:38 +01:00
Niels Lohmann 6d8d043add ♻️ make function static 2022-01-05 21:21:46 +01:00
Niels Lohmann 4b6220acf2 ✏️ fix typo 2022-01-05 21:18:27 +01:00
Niels Lohmann 4fc7b3dc7c 🔧 adjust docset generation script 2022-01-04 15:20:50 +01:00
Niels Lohmann cc59ab122f Merge branch 'release/3.10.5' into develop 2022-01-03 06:40:28 +01:00
Niels Lohmann 4f8fba1406 Merge branch 'release/3.10.5' 2022-01-03 06:40:09 +01:00
Niels Lohmann b5364faf9d 🔖 set version to 3.10.5 2022-01-02 22:35:35 +01:00
Niels Lohmann 67c8ead923 Merge branch 'release/3.10.4' into develop 2021-10-16 14:47:23 +02:00
Niels Lohmann fec56a1a16 Merge branch 'release/3.10.4' 2021-10-16 14:47:12 +02:00
Niels Lohmann a09bfa5faa 🔖 set version to 3.10.4 2021-10-16 13:34:31 +02:00
Niels Lohmann 4b1cb9eee1 Merge branch 'release/3.10.3' into develop 2021-10-08 14:39:34 +02:00
Niels Lohmann aa0e847e5b Merge branch 'release/3.10.3' 2021-10-08 14:39:21 +02:00
Niels Lohmann ab6a2c7425 🔖 set version to 3.10.3 2021-10-08 13:58:48 +02:00
Niels Lohmann 9dfd91695c Merge branch 'release/3.10.2' into develop 2021-08-26 09:08:33 +02:00
Niels Lohmann 626e7d61e4 Merge branch 'release/3.10.2' 2021-08-26 09:08:14 +02:00
Niels Lohmann 33b674b4b2 🔖 set version to 3.10.2 2021-08-26 08:13:04 +02:00
Niels Lohmann 1fd2213fd2 Merge branch 'release/3.10.1' into develop 2021-08-24 21:08:43 +02:00
Niels Lohmann b488724ecd Merge branch 'release/3.10.1' 2021-08-24 21:08:29 +02:00
Niels Lohmann 8ad66e9136 🔖 set version to 3.10.1 2021-08-24 20:19:55 +02:00
Niels Lohmann 97c7a35a2b ✅ add regression test 2021-08-20 14:49:58 +02:00
Niels Lohmann e8e93ee43b 👷 update Travis badge 2021-08-20 13:53:31 +02:00
Niels Lohmann 55281e03af 📝 add documentation for integration via vcpkg 2021-08-18 21:25:23 +02:00
Niels Lohmann 23e3b622aa 📝 add documentation for integration via vcpkg 2021-08-18 20:49:13 +02:00
Niels Lohmann f79bed6d39 👷 avoid duplicate AppVeyor builds 2021-08-18 19:53:35 +02:00
Niels Lohmann cfb71ad1bf 🐛 adding missing header 2021-08-18 13:33:35 +02:00
Niels Lohmann 54d9cd5a12 🔧 guard tests with JSON_Install flag 2021-08-18 13:24:12 +02:00
Niels Lohmann 5d3ad31d7e 🔥 remove outdated json_unit binary 2021-08-18 12:41:03 +02:00
Niels Lohmann f42a74b8f5 Merge branch 'release/3.10.0' into develop 2021-08-17 20:40:42 +02:00
Niels Lohmann 0b7471b0f7 Merge branch 'release/3.10.0' 2021-08-17 20:40:25 +02:00
Niels Lohmann 1de378f580 🔖 set version to 3.10.0 2021-08-17 15:23:23 +02:00
Niels Lohmann f1e63a8322 👷 run CI for release branches 2021-08-16 15:40:57 +02:00
Niels Lohmann fa5d3b5a9b 👷 run CI for release branches 2021-08-15 22:49:31 +02:00
Niels Lohmann 09237272bc 👥 update documentation 2021-08-15 21:05:26 +02:00
Niels Lohmann 1aceeff3fc 🚨 fix C4244 warning 2021-08-14 13:40:52 +02:00
Niels Lohmann 0a0eb7a850 Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 
 Conflicts:
	.github/workflows/windows.yml
 2021-08-14 11:19:48 +02:00
Niels Lohmann 4b0e04eb68 🚨 fix C4100 warnings 2021-08-13 17:03:55 +02:00
Niels Lohmann 288cdf9af7 ⚗️ add -WX flag to MSVC builds 2021-08-13 14:07:17 +02:00
Niels Lohmann fecb01858b ⚗️ add -WX flag to MSVC builds 2021-08-13 13:28:17 +02:00
Niels Lohmann 789280fcb2 🚨 fix C4309 warning 2021-08-13 13:20:26 +02:00
Niels Lohmann e65db83448 ⚗️ add -WX flag to MSVC builds 2021-08-13 12:42:38 +02:00
Niels Lohmann e20f3f95eb 🚨 guard GCC pragmas #2924 2021-08-11 23:55:46 +02:00
Niels Lohmann 8ae31a56a5 Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-11 08:06:32 +02:00
Niels Lohmann 68d8661f1b 📝 update documentation 2021-08-11 08:06:25 +02:00
Niels Lohmann b792bf5660 ⚗️ try minimal example 2021-08-10 10:29:13 +02:00
Niels Lohmann 26569f8ecc ⚗️ try minimal example 2021-08-10 10:09:31 +02:00
Niels Lohmann edc203a837 ⚗️ try minimal example 2021-08-10 08:35:14 +02:00
Niels Lohmann 0d530c9de8 ⚗️ try minimal example 2021-08-10 08:22:21 +02:00
Niels Lohmann 36394cc262 ⚗️ try minimal example 2021-08-09 21:58:05 +02:00
Niels Lohmann 83c005f881 ⚗️ try minimal example 2021-08-09 21:43:03 +02:00
Niels Lohmann 523f7c2c9d 💡 update documentation 2021-08-08 13:24:17 +02:00
Niels Lohmann db7ccafbda 💚 fix MSVC build 2021-08-07 13:55:25 +02:00
Niels Lohmann a4c3cf7798 💚 fix MSVC build 2021-08-07 13:40:01 +02:00
Niels Lohmann 346c9c1a19 💚 fix MSVC build 2021-08-07 13:37:17 +02:00
Niels Lohmann c5928501b0 💚 fix MSVC build 2021-08-07 13:19:25 +02:00
Niels Lohmann 176e9bf0ab ✅ add tests for CBOR 2021-08-07 13:14:08 +02:00
Niels Lohmann b74474e3fd 💚 fix MSVC build 2021-08-07 13:14:00 +02:00
Niels Lohmann 89c98dfc20 ✨ add option to process binary subtypes in CBOR 2021-08-06 16:41:01 +02:00
Niels Lohmann 51a9880022 ✅ add tests for CBOR 2021-08-06 15:31:11 +02:00
Niels Lohmann b7db1d68d9 ♻️ fix CBOR and BSON 2021-08-06 14:36:38 +02:00
Niels Lohmann 046df035fa ♻️ change type of binary subtype 2021-08-06 13:45:35 +02:00
Niels Lohmann 3eb1fb6be7 ♻️ change type of binary subtype 2021-08-06 13:26:00 +02:00
Niels Lohmann 5c38e76c11 Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 2021-08-06 13:23:26 +02:00
Niels Lohmann 7c19aa2210 ♻️ overwork byte_container_with_subtype 2021-08-01 22:00:57 +02:00
Niels Lohmann eb488bb4d9 📝 add note for wstring handling 2021-08-01 20:54:02 +02:00