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
Dimitris Apostolou
b785783440
Fix typo ( #3249 )
2022-01-05 13:35:14 +01:00
Niels Lohmann
6cd68ebd12
📝 add documentation for JSON Lines ( #3247 )
2022-01-05 09:51:29 +01:00
Niels Lohmann
4fc7b3dc7c
🔧 adjust docset generation script
2022-01-04 15:20:50 +01:00
Niels Lohmann
a8e86ba948
📝 improve documentation InputType and IteratorType ( #3246 )
2022-01-04 15:02:39 +01:00
Niels Lohmann
9e89c2fdb5
♻️ remove stringstream ( #3244 )
2022-01-04 09:25:41 +01:00
Giovanni Cerretani
78ddf2bcf8
fix _MSC_VER version to check for std::filesystem ( #3240 )
2022-01-03 13:57:51 +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
b69713c394
Fix compilation error with NVCC ( #3234 )
2022-01-02 09:03:56 +01:00
Niels Lohmann
926df56ddb
🔥 remove Travis CI #3087 ( #3233 )
2021-12-31 11:04:29 +01:00
Niels Lohmann
1aca6cb949
Add build step for NVCC and fix a warning ( #3227 )
...
* 👷 add step for NVCC build #2676
* 🚨 fix warning (code taken from #2736 )
* 👷 use version 2.2.0 of the CI image
2021-12-30 13:40:15 +01:00
Niels Lohmann
e6bf789f7d
⬆️ update cpplint ( #3225 )
2021-12-29 20:20:15 +01:00
Niels Lohmann
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
Niels Lohmann
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
Maarten Becker
825d3230d1
Fix: Warning for shadowed variables ( #3188 ) ( #3193 )
...
* Rename variable count to resolve shadowing (#3188 )
* Amalgamate: Rename variable count to resolve shadowing (#3188 )
Co-authored-by: Maarten Becker <maarten.becker@nuc-eng.com>
2021-12-17 07:24:59 +01:00
Prince Mendiratta
760304635d
Fix FAQ hyperlink typo in readme ( #3148 )
...
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
2021-11-18 11:58:49 +01:00
Daniel Albuschat
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
Dirk Stolle
fe230334d9
fix typos in documentation ( #3140 )
...
* fix typos in documentation
* revert changes to ChangeLog.md
2021-11-14 14:25:14 +01:00
Niels Lohmann
e9f88c2fad
Add missing erase(first, last) function to ordered_map ( #3109 )
2021-11-09 22:24:58 +01:00
Alex Beregszaszi
834918018e
Fix spelling ( #3125 )
2021-11-09 14:46:58 +01:00
Niels Lohmann
5c08a52fd6
♻️ overwork std specializations ( #3121 )
2021-11-04 16:38:40 +01:00
Niels Lohmann
5d87c4d409
Add recursive update function ( #3069 )
...
* ✨ add recursive update function
2021-11-03 13:52:20 +01:00
Niels Lohmann
7440786b81
Update CI ( #3088 )
...
* 👷 prepare GitHub actions for new Docker image
* 👷 use experimental docker image
* 👷 use Clang-Analyzer 14
* 🔇 suppress readability-identifier-length
* 🔇 suppress more Clang-Tidy warnings
* ♻️ simplify code
* 🔇 suppress more Clang-Tidy warnings
* 🔇 suppress more Clang-Tidy warnings
* 🚨 fix warning
* 🚨 fix warning
* 🚨 fix warning
* 👷 use new Docker image
2021-10-29 21:27:34 +02:00
Niels Lohmann
c4a4e672fd
📝 add examples for parsing from iterator pair ( #3100 )
2021-10-29 21:26:41 +02:00
Cristi Vîjdea
f5b3fb326c
Fix typos in operator[] documentation ( #3102 )
...
* Fix typos in operator[] documentation
* Fix additional typo
2021-10-20 21:59:33 +02: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
80cf9d7065
Revert invalid fix ( #3082 )
...
* ⏪ revert invalid fix
2021-10-16 13:27:28 +02:00
Niels Lohmann
ba046e4ea4
Allow to use get with explicit constructor ( #3079 )
...
* ⏪ remove "fix" that caused #3077
2021-10-14 21:01:14 +02:00
Théo DELRIEU
0e694b4060
fix std::filesystem::path regression ( #3073 )
...
* meta: rework is_compatible/is_constructible_string_type
These type traits performed an incorrect and insufficient check.
Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in #3020 broke them.
* support std::filesystem::path
Fixes #3070
2021-10-14 19:19:46 +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
Théo DELRIEU
80df5e8de6
meta: fix is_compatible/constructible traits ( #3020 )
...
The previous version relied on the existence of an 'iterator' type.
As mentioned in comments, this is not the proper way to do it and
causes issues with certain types (e.g. views from range-v3).
Add a 'is_range' trait that properly detects the return type of
'begin'/'end', and use it in instead.
2021-10-07 12:32:25 +02:00
Carl Smedstad
62f2997b79
Fix assertion failure for JSON_DIAGNOSTICS ( #3037 )
...
* Fix assertion failure #3032
2021-10-07 12:24:09 +02:00
Niels Lohmann
ea528bbfda
📝 fixed Clang version ( #3040 )
2021-09-28 12:36:42 +02:00
Niels Lohmann
0b345b20c8
Allow allocators for output_vector_adapter ( #2989 )
...
* ♻️ allow allocators for vectors
* ✅ add regression tests
2021-09-12 18:55:47 +02:00
Anthony VH
58b83b71dc
Set parent pointers for values inserted via update() ( fixes #3007 ). ( #3008 )
...
* Set parent pointers for values inserted via update() (fixes #3007 ).
* Moved test for #3007 to proper file.
* Enable access to private members in diagnostics unit tests.
* Make style consistent with rest of code.
* Forced amalgamate rerun.
* Refactor test for #3007 so it doesn't use private members. Also extend to test both update() functions.
* Added fix for #3007 to update(const_iterator, const_iterator) as well.
* Added failing example code from #3007 as extra test.
2021-09-12 18:51:25 +02:00
Niels Lohmann
bbdb29c658
Update docset generation script ( #2967 )
...
* 📝 update docset generation script
* 📝 update documentation
2021-09-01 08:43:10 +02:00
Niels Lohmann
fd0aa4fb0d
👷 re-add Clang 12 ( #2986 )
2021-08-30 10:54:14 +02:00
Niels Lohmann
e0b02c355e
Use new Docker image ( #2981 )
2021-08-29 18:05:31 +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