From d33af93e175b7c69b56aca54a8eae8e6b3981760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Wed, 19 Feb 2020 20:23:02 +0100
Subject: [PATCH] Cleanup visibility in generic not matcher

---
 src/catch2/catch_matchers_templates.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/catch2/catch_matchers_templates.hpp b/src/catch2/catch_matchers_templates.hpp
index b8f6e852..1a8bedbd 100644
--- a/src/catch2/catch_matchers_templates.hpp
+++ b/src/catch2/catch_matchers_templates.hpp
@@ -170,6 +170,11 @@ namespace Matchers {
                 return "not " + m_matcher.toString();
             }
 
+            //! Negating negation can just unwrap and return underlying matcher
+            friend MatcherT const& operator ! (Detail::MatchNotOfGeneric<MatcherT> const& matcher) {
+                return matcher.m_matcher;
+            }
+        private:
             MatcherT const& m_matcher;
         };
     } // namespace Detail
@@ -190,6 +195,7 @@ namespace Matchers {
         return { lhs, rhs };
     }
 
+    //! Wrap provided generic matcher in generic negator
     template<typename MatcherT>
     typename std::enable_if<Detail::is_generic_matcher<MatcherT>::value, Detail::MatchNotOfGeneric<MatcherT>>::type
         operator ! (MatcherT const& matcher) {
@@ -260,12 +266,6 @@ namespace Matchers {
         return Detail::MatchAnyOfGeneric<MatcherLHS, MatchersRHS...>{Detail::array_cat(static_cast<void const*>(std::addressof(lhs)), std::move(rhs.m_matchers))};
     }
 
-    template<typename MatcherT>
-    MatcherT const& operator ! (Detail::MatchNotOfGeneric<MatcherT> const& matcher) {
-        return matcher.m_matcher;
-    }
-
-
 } // namespace Matchers
 } // namespace Catch