Niels Lohmann
ca5ecc2945
🔥 consolidate documentation
2021-11-03 14:51:19 +01:00
Niels Lohmann
cc218b7e80
💚 fix build
2021-11-03 14:16:54 +01:00
Niels Lohmann
561fe8959c
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
...
Conflicts:
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
2021-11-03 13:58:08 +01:00
Niels Lohmann
5d87c4d409
Add recursive update function ( #3069 )
...
* ✨ add recursive update function
2021-11-03 13:52:20 +01:00
Niels Lohmann
dee9c8c4db
🔥 consolidate documentation
2021-11-01 22:28:53 +01:00
Niels Lohmann
fd054df1c6
🔥 consolidate documentation
2021-10-31 14:02:31 +01:00
Niels Lohmann
ade4e8b8db
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
2021-10-31 12:48:22 +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
64c7d3c9d8
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
...
Conflicts:
doc/Doxyfile
doc/examples/README.link
2021-10-16 14:53:59 +02:00
Niels Lohmann
9dc6d70db8
🔥 consolidate documentation
2021-10-16 14:45:29 +02:00
Niels Lohmann
7dfe09f7ac
🔥 consolidate documentation
2021-10-16 14:21:49 +02:00
Niels Lohmann
15a779cde7
🔥 consolidate documentation
2021-10-16 14:10:09 +02:00
Niels Lohmann
17a31bf503
🔥 consolidate documentation
2021-10-16 13:56:49 +02:00
Niels Lohmann
a09bfa5faa
🔖 set version to 3.10.4
2021-10-16 13:34:31 +02:00
Niels Lohmann
ac91ab5798
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
2021-10-14 21:03:07 +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
Niels Lohmann
421555bb01
🔥 consolidate documentation
2021-10-13 22:12:49 +02:00
Niels Lohmann
0de7ba9b2c
🔥 consolidate documentation
2021-10-13 22:03:34 +02:00
Niels Lohmann
0eea6f241e
🔥 consolidate documentation
2021-10-13 21:54:41 +02:00
Niels Lohmann
0b02eb0dfb
🔥 consolidate documentation
2021-10-13 21:44:34 +02:00
Niels Lohmann
13d4e6bcf9
🔥 consolidate documentation
2021-10-13 21:21:02 +02:00
Niels Lohmann
fdef0dc860
🔥 consolidate documentation
2021-10-13 21:17:14 +02:00
Niels Lohmann
d41464eee0
🔥 consolidate documentation
2021-10-10 16:07:47 +02:00
Niels Lohmann
25ff9a2d6f
🔥 consolidate documentation
2021-10-10 15:57:54 +02:00
Niels Lohmann
0868c356f6
🔥 consolidate documentation
2021-10-10 15:47:46 +02:00
Niels Lohmann
5e04a6a2ba
🔥 consolidate documentation
2021-10-10 15:32:59 +02:00
Niels Lohmann
cb60de9e69
🔥 consolidate documentation
2021-10-10 15:12:26 +02:00
Niels Lohmann
ab6a2c7425
🔖 set version to 3.10.3
2021-10-08 13:58:48 +02:00
Carl Smedstad
62f2997b79
Fix assertion failure for JSON_DIAGNOSTICS ( #3037 )
...
* Fix assertion failure #3032
2021-10-07 12:24:09 +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
33b674b4b2
🔖 set version to 3.10.2
2021-08-26 08:13:04 +02:00
Niels Lohmann
8ad66e9136
🔖 set version to 3.10.1
2021-08-24 20:19:55 +02:00
Niels Lohmann
c753165db6
Fix parent update for diagnostics with ordered_json ( #2963 )
...
🐛 fix parent update for diagnostics with ordered_json
2021-08-22 20:30:20 +02:00
Niels Lohmann
1de378f580
🔖 set version to 3.10.0
2021-08-17 15:23:23 +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
Ferry Huberts
364a21be6b
Add coverage exclusion comments, as requested
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 15:30:55 +02:00
Ferry Huberts
e7a69b8d31
Adjust more files after actually building like the CI
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 14:00:00 +02:00
Ferry Huberts
44d60f8d14
All: fix warnings when compiling with -Wswitch-enum
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-12 16:33:50 +02:00
Niels Lohmann
e20f3f95eb
🚨 guard GCC pragmas #2924
2021-08-11 23:55:46 +02:00
Niels Lohmann
523f7c2c9d
💡 update documentation
2021-08-08 13:24:17 +02:00
Niels Lohmann
b7db1d68d9
♻️ fix CBOR and BSON
2021-08-06 14:36:38 +02:00
Sven Fink
353d59717e
Add more suppressions on float comparisons
2021-08-04 08:34:53 +02:00
Louis Dionne
b0e5965d71
Properly constrain the basic_json conversion operator
...
Fixes #2491
2021-07-19 11:16:27 -04:00
Niels Lohmann
3e4723a49f
🔨 remove noexcept annotation
2021-07-15 21:49:09 +02:00
Niels Lohmann
149ded856f
♻️ simplify destroy() function for primitive types
2021-07-15 12:46:48 +02:00
Niels Lohmann
a711e1f5a7
🚨 fix warnings
2021-07-13 15:37:57 +02:00
Niels Lohmann
3bb9467073
♻️ move capacity check to set_parent function
2021-07-13 15:27:27 +02:00
Niels Lohmann
bc7e8faa4f
🔥 remove duplicated line
2021-07-12 19:21:07 +02:00
Niels Lohmann
b0730f29cf
🐛 fix logics
2021-07-12 15:24:06 +02:00
Niels Lohmann
d40e98ecef
🐛 fix assertion failure #2838
2021-07-12 13:38:28 +02:00
