Niels Lohmann
59bce783be
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
2021-12-28 22:53:03 +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
d1f84e81e9
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
...
Conflicts:
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
2021-11-13 14:31:42 +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
e324936b56
📝 document documentation generation
2021-11-07 20:17:01 +01:00
Niels Lohmann
0b263259e2
🔥 consolidate documentation
2021-11-06 15:37:40 +01:00
Niels Lohmann
d452be4d21
🔥 consolidate documentation
2021-11-05 23:29:15 +01:00
Niels Lohmann
7ea83ca417
🔥 consolidate documentation
2021-11-05 22:10:17 +01:00
Niels Lohmann
cec1bd8476
♻️ fix URLs
2021-11-05 21:46:15 +01:00
Niels Lohmann
eff06842f0
🔥 consolidate documentation
2021-11-05 21:43:46 +01:00
Niels Lohmann
e624c8941d
🔥 consolidate documentation
2021-11-05 15:11:05 +01:00
Niels Lohmann
7bfe76848a
🔥 consolidate documentation
2021-11-05 13:33:21 +01:00
Niels Lohmann
0d06b5d5e7
🔥 consolidate documentation
2021-11-04 22:36:11 +01:00
Niels Lohmann
54b05a2672
🔥 consolidate documentation
2021-11-04 22:02:48 +01:00
Niels Lohmann
5c08a52fd6
♻️ overwork std specializations ( #3121 )
2021-11-04 16:38:40 +01:00
Niels Lohmann
5534a77221
🔥 consolidate documentation
2021-11-04 14:26:05 +01:00
Niels Lohmann
4bf03fd8e7
🚨 suppress cert-dcl58-cpp
2021-11-03 22:27:41 +01:00
Niels Lohmann
dceb9b2493
♻️ overwork std specializations
2021-11-03 22:00:39 +01:00
Niels Lohmann
5663bfa6c6
🚨 fix -fpermissive warnings
2021-11-03 21:25:46 +01:00
Niels Lohmann
2e66720982
🚨 add namespace comment
2021-11-03 20:54:15 +01:00
Niels Lohmann
b62f82e664
💚 fix build
2021-11-03 20:41:16 +01:00
Niels Lohmann
42c37d9c01
♻️ overwork std specializations
2021-11-03 15:20:44 +01:00
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
a8a6511f17
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
2021-10-16 13:45:17 +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
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
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
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
