Merge remote-tracking branch 'origin/main' into threadpool

JeffersonLab · Sep 19, 2024 · 79f0173 · 79f0173
2 parents bdd6685 + f27ce57
commit 79f0173
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/examples/meson.build b/examples/meson.build
@@ -43,7 +43,7 @@ foreach example, info : example_sources
           [ get_option('test_data_file'), '100' ], # don't run too many events, or meson test log will be huge
         ),
         env: project_test_env,
-        timeout: 60,
+        timeout: 120,
       )
     endif
   endif

diff --git a/src/iguana/services/Logger.h b/src/iguana/services/Logger.h
@@ -1,8 +1,22 @@
 #pragma once
 
+// workaround https://github.com/fmtlib/fmt/issues/4133
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshift-overflow"
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
 #include <fmt/color.h>
 #include <fmt/format.h>
 #include <fmt/ranges.h>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#else
+#pragma GCC diagnostic pop
+#endif
+
 #include <functional>
 #include <unordered_map>