mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-06-13 02:02:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'nlohmann:develop' into develop

Browse Source
This commit is contained in:
Miko 2025-05-31 13:27:27 -04:00 committed by GitHub
commit fedbfa21b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-tidy
View File

@ -1,4 +1,5 @@
# TODO: The first three checks are only removed to get the CI going. They have to be addressed at some point. # TODO: The first three checks are only removed to get the CI going. They have to be addressed at some point.
# TODO: portability-avoid-pragma-once: should be fixed eventually
Checks: '*, Checks: '*,
@ -59,6 +60,7 @@ Checks: '*,
-modernize-use-std-numbers, -modernize-use-std-numbers,
-modernize-use-trailing-return-type, -modernize-use-trailing-return-type,
-performance-enum-size, -performance-enum-size,
-portability-avoid-pragma-once,
-readability-function-cognitive-complexity, -readability-function-cognitive-complexity,
-readability-function-size, -readability-function-size,
-readability-identifier-length, -readability-identifier-length,

7
tests/thirdparty/doctest/doctest.h vendored
View File

@ -4497,11 +4497,12 @@ namespace {
String translateActiveException() { String translateActiveException() {
#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS #ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
String res;
auto& translators = getExceptionTranslators(); auto& translators = getExceptionTranslators();
for(auto& curr : translators) for(auto& curr : translators) {
if(curr->translate(res)) String res;
if (curr->translate(res))
return res; return res;
}
// clang-format off // clang-format off
DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wcatch-value") DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wcatch-value")
try { try {