catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Cleanup visibility in generic not matcher
- Commit
d33af93e175b7c69b56aca54a8eae8e6b3981760- Author
- Martin Hořeňovský ·
- Parents
25c5ae240c35
Changes
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