Keep the mock lock alive to the end of the process

A static mutex needs an exit-time destructor, which Clang's warnings
refuse, and a mock of static lifetime can outlive it. The test seam is
held the same way, and a test covers a mock method with nothing after
its parameters, which needs an empty variadic argument to stay valid
under -Wpedantic.

2 files changed, 7 insertions, 5 deletions

diff --git a/src/Progmasoft/Catch3/Mock.hpp b/src/Progmasoft/Catch3/Mock.hpp
index 1e077ac8..f100041c 100644
--- a/src/Progmasoft/Catch3/Mock.hpp
+++ b/src/Progmasoft/Catch3/Mock.hpp
@@ -373,8 +373,8 @@ namespace Progmasoft::Catch3
             }
             else if constexpr (std::is_copy_constructible_v<Result>)
             {
-                return Does([held = Result(std::forward<Value>(value))](
-                                Arguments...) -> Result {
+                return Does([held = static_cast<Result>(std::forward<Value>(
+                                 value))](Arguments...) -> Result {
                     return held;
                 });
             }
@@ -925,7 +925,8 @@ namespace Progmasoft::Catch3
         field,                                                                 \
         arguments,                                                             \
         CATCH3_INTERNAL_MOCK_EXPAND(CATCH3_INTERNAL_MOCK_COUNT arguments),     \
-        CATCH3_INTERNAL_MOCK_EXPAND(CATCH3_INTERNAL_MOCK_FIRST(__VA_ARGS__))))
+        CATCH3_INTERNAL_MOCK_EXPAND(                                           \
+            CATCH3_INTERNAL_MOCK_FIRST(__VA_ARGS__, ))))
 
 /// Declares the member `name` of a mock class and, beside it, the mock
 /// `name##Mock` that `CATCH3_EXPECT_CALL` takes. The parenthesized list of
diff --git a/src/Progmasoft/Mock.cpp b/src/Progmasoft/Mock.cpp
index 2897838c..b1364450 100644
--- a/src/Progmasoft/Mock.cpp
+++ b/src/Progmasoft/Mock.cpp
@@ -93,8 +93,9 @@ namespace Progmasoft::Catch3::Detail
     std::unique_lock<std::recursive_mutex>
     LockMocks()
     {
-        static std::recursive_mutex mutex;
-        return std::unique_lock<std::recursive_mutex>{ mutex };
+        // Never destroyed: a mock of static lifetime can go after it would.
+        static auto *mutex = new std::recursive_mutex;
+        return std::unique_lock<std::recursive_mutex>{ *mutex };
     }
 
     void