From 2081caa452317b67e21f1ba9ebdb17fdda6f6fb6 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 14 Feb 2017 09:15:08 +0000 Subject: [PATCH] Import MatcherBase to Catch namespace --- include/internal/catch_matchers.hpp | 1 + include/internal/catch_matchers_string.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/internal/catch_matchers.hpp b/include/internal/catch_matchers.hpp index d11a8212..0dae615f 100644 --- a/include/internal/catch_matchers.hpp +++ b/include/internal/catch_matchers.hpp @@ -159,6 +159,7 @@ namespace Matchers { } // namespace Matchers using namespace Matchers; +using Matchers::Impl::MatcherBase; } // namespace Catch diff --git a/include/internal/catch_matchers_string.h b/include/internal/catch_matchers_string.h index 5cdad507..87476b12 100644 --- a/include/internal/catch_matchers_string.h +++ b/include/internal/catch_matchers_string.h @@ -25,7 +25,7 @@ namespace Matchers { std::string m_str; }; - struct StringMatcherBase : Impl::MatcherBase { + struct StringMatcherBase : MatcherBase { StringMatcherBase( std::string operation, CasedString const& comparator ); virtual std::string describe() const CATCH_OVERRIDE;