From 0c20ca1ce92b684b85f736ddb0893b34dfc5308f Mon Sep 17 00:00:00 2001
From: Alexander Grund <Flamefire@users.noreply.github.com>
Date: Tue, 25 Jan 2022 18:46:18 +0100
Subject: [PATCH] Make MOCK_SIGNATURE macro shorter

Put most of it into a template-alias as this may turn up in error messages
---
 include/turtle/detail/signature.hpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/turtle/detail/signature.hpp b/include/turtle/detail/signature.hpp
index f76c7b0..ee8e577 100644
--- a/include/turtle/detail/signature.hpp
+++ b/include/turtle/detail/signature.hpp
@@ -54,21 +54,22 @@ namespace mock { namespace detail {
     struct signature<Sig(C::*)> : signature<typename strip_function_qualifiers<Sig>::type>
     {};
 
+    template<typename M>
+    using signature_t = typename signature<std::remove_cv_t<std::remove_reference_t<M>>>::type;
+
     template<typename T>
     struct base
     {
         typedef T base_type;
     };
 
-    // if an error is generated by the line below it means
-    // the method is ambiguous : specify its signature to
-    // disambiguate
+    // if an error is generated by the line below it means the method is ambiguous:
+    // specify its signature to disambiguate
     template<typename T>
     T& ambiguous_method_requires_to_specify_signature(const T&);
 }} // namespace mock::detail
 
-#define MOCK_SIGNATURE(M)                                                      \
-    mock::detail::signature<std::remove_cv_t<std::remove_reference_t<decltype( \
-      mock::detail::ambiguous_method_requires_to_specify_signature(&base_type::M))>>>::type
+#define MOCK_SIGNATURE(M) \
+    mock::detail::signature_t<decltype(mock::detail::ambiguous_method_requires_to_specify_signature(&base_type::M))>
 
 #endif // MOCK_SIGNATURE_HPP_INCLUDED