Merge branch 'nlohmann:develop' into develop

.clang-tidy

@@ -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: portability-avoid-pragma-once: should be fixed eventually
 
 Checks: '*,
 
@@ -59,6 +60,7 @@ Checks: '*,
          -modernize-use-std-numbers,
          -modernize-use-trailing-return-type,
          -performance-enum-size,
+         -portability-avoid-pragma-once,
          -readability-function-cognitive-complexity,
          -readability-function-size,
          -readability-identifier-length,

tests/thirdparty/doctest/doctest.h

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