Niels Lohmann
8372e03e57
🚨 fix warnings
2021-12-24 15:11:25 +01:00
Niels Lohmann
7001266b52
🚨 fix warnings
2021-12-24 14:59:42 +01:00
Niels Lohmann
6e6a82fd66
🚨 fix warnings
2021-12-24 14:36:40 +01:00
Niels Lohmann
4bf052a780
💚 fix script
2021-12-24 14:19:17 +01:00
Niels Lohmann
78baaa9975
🚨 fix warnings
2021-12-24 13:52:14 +01:00
Niels Lohmann
69f9c41d29
🚨 fix warnings
2021-12-24 13:41:05 +01:00
Niels Lohmann
05874dcf70
🚨 fix warnings
2021-12-24 13:29:19 +01:00
Niels Lohmann
742d85fc7c
🚨 fix warnings
2021-12-24 13:11:25 +01:00
Niels Lohmann
1ca9510427
🚨 fix warnings
2021-12-24 09:41:27 +01:00
Niels Lohmann
30ab9c402c
🚨 fix warnings
2021-12-24 09:27:18 +01:00
Niels Lohmann
62fe919b5d
⚗️ use fix from https://github.com/nlohmann/json/pull/3101#issuecomment-998788786
2021-12-23 22:30:58 +01:00
Niels Lohmann
7566b3b40d
Merge branch 'develop' of https://github.com/nlohmann/json into issue3090
2021-12-23 21:53:18 +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
Niels Lohmann
19f75a275e
🚨 suppress modernize-concat-nested-namespaces warning
2021-11-21 14:23:45 +01:00
Niels Lohmann
cf6903ec00
Merge branch 'develop' of https://github.com/nlohmann/json into issue3090
2021-11-21 13:40: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
Niels Lohmann
fed411499f
💚 replace "and" with "&&"
2021-10-21 22:08:10 +02:00
Niels Lohmann
61829d799e
💚 remove leftover
2021-10-21 22:01:13 +02:00
Niels Lohmann
37be287bae
🔨 add more constraints #3097
2021-10-21 21:56:12 +02:00
Niels Lohmann
d300856292
✅ add test
2021-10-21 07:43:52 +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
ccd42cd3ac
⏪ undo cleanup
2021-10-20 21:54:09 +02:00
Niels Lohmann
4c10ccafd9
🔨 cleanup
2021-10-20 20:35:07 +02:00
Niels Lohmann
7e87863a6d
🚨 fix warning
2021-10-20 20:23:54 +02:00
Niels Lohmann
7543e179ef
⚗️ do not use too old compilers with C++17
2021-10-20 19:23:05 +02:00
Niels Lohmann
2b431c212f
⚗️ do not use too old compilers with C++17
2021-10-20 19:14:48 +02:00
Niels Lohmann
12bb88871e
⚗️ do not use too old compilers with C++17
2021-10-20 15:18:00 +02:00
Niels Lohmann
5cd67e7d23
⚗️ use proper header for filesystem
2021-10-20 15:03:50 +02:00
Niels Lohmann
930e2cf418
⚗️ use proper header for filesystem
2021-10-20 14:52:15 +02:00
Niels Lohmann
c33bac8352
⏪ revert removal of code
2021-10-20 14:23:56 +02:00
Niels Lohmann
03a75d58fc
🚨 fix warnings
2021-10-20 14:19:45 +02:00
Niels Lohmann
d90b6bc721
⚗️ use proper header for filesystem
2021-10-20 13:52:28 +02:00
Niels Lohmann
7fb709c366
⚗️ add C++17 copies of the test binaries
2021-10-20 13:11:12 +02:00
Niels Lohmann
cf2a896bcd
⚗️ add C++17 copies of the test binaries
2021-10-20 13:03:08 +02:00
Niels Lohmann
879217d008
⚗️ add C++17 copies of the test binaries
2021-10-20 12:19:53 +02:00
Niels Lohmann
67c8ead923
Merge branch 'release/3.10.4' into develop
2021-10-16 14:47:23 +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
ab6a2c7425
🔖 set version to 3.10.3
2021-10-08 13:58:48 +02:00
