1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-25 13:41:56 +03:00
Commit Graph

86 Commits

Author SHA1 Message Date
4a6e6ca8c7 📝 update documentation 2022-03-07 13:48:24 +01:00
8d7b5b6a28 Add clarification to avoid misunderstanding that cause #3360 (#3378)
* Update macros.md

Typos, typos
2022-03-07 13:43:50 +01:00
c6d8892e5d FetchContent_MakeAvailable (#3351)
* 🔧 use FetchContent_MakeAvailable

* 💚 fix test names
2022-03-06 15:33:05 +01:00
d8a63291cb 📝 add note on parsing ordered_json #3325 (#3326) 2022-02-12 15:45:51 +01:00
eec79d4e8a Add macros NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and ..._NON_INTRUSIVE_WITH_DEFAULT (#3143)
* Added new macros NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT.

* Updated docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT accordingly

* Rephrased docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT

* Updated docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT

* Renamed default_obj in to avoid name clashes

* Added test for serialization of default constructed object

* Add const to getters for macro tests

Co-authored-by: Chaoya Li <harry75369@gmail.com>
2022-01-30 22:06:50 +01:00
c11f98228d 📝 document FetchContent 2022-01-30 13:05:18 +01:00
293f67f9ff Fix a typo (#3265) 2022-01-12 21:43:22 +01:00
c6740d7d58 📝 add documentation for default behavior for macros 2022-01-11 21:46:40 +01:00
ef556019be 📝 overwork documentation 2022-01-09 14:32:38 +01:00
4b6220acf2 ✏️ fix typo 2022-01-05 21:18:27 +01:00
b785783440 Fix typo (#3249) 2022-01-05 13:35:14 +01:00
6cd68ebd12 📝 add documentation for JSON Lines (#3247) 2022-01-05 09:51:29 +01:00
a8e86ba948 📝 improve documentation InputType and IteratorType (#3246) 2022-01-04 15:02:39 +01:00
b5364faf9d 🔖 set version to 3.10.5 2022-01-02 22:35:35 +01:00
29cd970b94 Consolidate documentation (#3071)
* 🔥 consolidate documentation
* ♻️ overwork std specializations
* 🚚 move images files to mkdocs
* ♻️ fix URLs
* 🔧 tweak MkDocs configuration
* 🔧 add namespaces
* 📝 document deprecations
* 📝 document documentation generation
* 🚸 improve search
* 🚸 add examples
* 🚧 start adding documentation for macros
* 📝 add note for https://github.com/nlohmann/json/issues/874#issuecomment-1001699139
* 📝 overwork example handling
* 📝 fix Markdown tables
2021-12-29 13:41:01 +01:00
6d3115924c Add C++17 copies of the test binaries (#3101)
* ⚗️ add C++17 copies of the test binaries
* ⚗️ use proper header for filesystem
* 🚨 fix warnings
* ⚗️ do not use too old compilers with C++17
*  add test
* 🔨 add more constraints #3097
* ⚗️ use fix from https://github.com/nlohmann/json/pull/3101#issuecomment-998788786
* ⚗️ use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
* 👷 use published CI image
2021-12-29 09:47:05 +01:00
ee1208aa60 Docs: Update skip_comments to ignore_comments (#3145)
In the docs, the `ignore_comments` parameter to `nlohmann::json::parse()` is described as `skip_comments`, which does not match the actual implementation. While the demo code compiles and works, the parameter name is wrong.
2021-11-17 19:21:54 +01:00
fe230334d9 fix typos in documentation (#3140)
* fix typos in documentation

* revert changes to ChangeLog.md
2021-11-14 14:25:14 +01:00
5d87c4d409 Add recursive update function (#3069)
*  add recursive update function
2021-11-03 13:52:20 +01:00
c4a4e672fd 📝 add examples for parsing from iterator pair (#3100) 2021-10-29 21:26:41 +02:00
f5b3fb326c Fix typos in operator[] documentation (#3102)
* Fix typos in operator[] documentation
* Fix additional typo
2021-10-20 21:59:33 +02:00
bbdb29c658 Update docset generation script (#2967)
* 📝 update docset generation script

* 📝 update documentation
2021-09-01 08:43:10 +02:00
7194245a31 Fixed typo in parse.md (#2968)
Changed a potential typo: "charater" -> "character"
2021-08-24 08:08:02 +02:00
34e2c4ab88 📝 add link to Homebrew package (#2966) 2021-08-22 21:58:37 +02:00
44ffaa052c Merge pull request #2943 from amirmasoudabdol/patch-1
Updating the Homebrew Command
2021-08-19 12:03:52 +02:00
14af5d4a9f fixing the doc files 2021-08-19 09:31:39 +02:00
23e3b622aa 📝 add documentation for integration via vcpkg 2021-08-18 20:49:13 +02:00
8cae9d7cd2 Overwork warning flags (#2936)
* ⚗️ update warning flags
2021-08-17 14:43:43 +02:00
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
8ae31a56a5 Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-11 08:06:32 +02:00
68d8661f1b 📝 update documentation 2021-08-11 08:06:25 +02:00
523f7c2c9d 💡 update documentation 2021-08-08 13:24:17 +02:00
eb488bb4d9 📝 add note for wstring handling 2021-08-01 20:54:02 +02:00
19a5e12136 CMake cleanup (#2885)
* 🔥 clean CMake files and Makefile
* 💡 update documentation
2021-07-22 09:25:55 +02:00
a0863b8c20 📝 add support section 2021-07-17 13:44:54 +02:00
3db8903f29 📝 restructure README 2021-07-16 15:00:11 +02:00
fb1ee4f94b 📝 update documentation 2021-07-16 14:41:14 +02:00
a82f66beed 📝 document JSON_NO_IO macro #2842 2021-07-10 12:51:18 +02:00
5c8d0af5ce 📝 add comment for handling of negative zeros #2854 2021-07-10 12:50:59 +02:00
e970f31066 Update arbitrary_types.md 2021-06-18 12:44:27 +03:00
d0ab2b86c3 📝 update documentation 2021-04-29 17:19:57 +02:00
cdfe865486 📝 add documentation for numbers 2021-04-28 20:33:05 +02:00
ca9a1f2fd4 📝 add note to outdated exceptions 2021-03-24 12:46:34 +01:00
90d51b9205 Update parse_exceptions.md
Referring to https://github.com/nlohmann/json/blob/develop/doc/examples/parse_error.cpp  and https://json.nlohmann.me/home/exceptions/
(and also based on testing), the catch command should reference `catch (json::parse_error& ex)` and not `catch (json::exception::parse_error& ex)`
2021-03-18 12:25:12 -04:00
7b7da08fb6 📝 update documentation 2021-01-23 10:04:19 +01:00
d00ad33e46 📝 update documentation 2021-01-21 21:47:19 +01:00
3322c9df6e 🔒 use HTTPS 2020-12-06 14:41:48 +01:00
b386f4de0b 📝 fix and extend documentation of discarded values 2020-08-19 20:26:06 +02:00
3be6ee3525 🚚 remove < from filename to fix Windows build 2020-08-16 21:39:40 +02:00
fe507a7ee8 🚚 remove < from filename to fix Windows build 2020-08-16 21:36:21 +02:00