mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 13:26:10 +01:00
Combined matchers are now final
This commit is contained in:
parent
cf6575576f
commit
260263b9bf
@ -58,7 +58,7 @@ namespace Matchers {
|
||||
namespace Detail {
|
||||
|
||||
template<typename ArgT>
|
||||
struct MatchAllOf : MatcherBase<ArgT> {
|
||||
struct MatchAllOf final : MatcherBase<ArgT> {
|
||||
MatchAllOf() = default;
|
||||
MatchAllOf(MatchAllOf const&) = delete;
|
||||
MatchAllOf& operator=(MatchAllOf const&) = delete;
|
||||
@ -112,7 +112,7 @@ namespace Matchers {
|
||||
MatchAllOf<ArgT> operator&& (MatcherBase<ArgT> const& lhs, MatchAllOf<ArgT> const& rhs) = delete;
|
||||
|
||||
template<typename ArgT>
|
||||
struct MatchAnyOf : MatcherBase<ArgT> {
|
||||
struct MatchAnyOf final : MatcherBase<ArgT> {
|
||||
MatchAnyOf() = default;
|
||||
MatchAnyOf(MatchAnyOf const&) = delete;
|
||||
MatchAnyOf& operator=(MatchAnyOf const&) = delete;
|
||||
@ -165,7 +165,7 @@ namespace Matchers {
|
||||
MatchAnyOf<ArgT> operator|| (MatcherBase<ArgT> const& lhs, MatchAnyOf<ArgT> const& rhs) = delete;
|
||||
|
||||
template<typename ArgT>
|
||||
struct MatchNotOf : MatcherBase<ArgT> {
|
||||
struct MatchNotOf final : MatcherBase<ArgT> {
|
||||
|
||||
explicit MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ):
|
||||
m_underlyingMatcher( underlyingMatcher )
|
||||
|
@ -107,7 +107,7 @@ namespace Matchers {
|
||||
|
||||
|
||||
template<typename... MatcherTs>
|
||||
struct MatchAllOfGeneric : MatcherGenericBase {
|
||||
struct MatchAllOfGeneric final : MatcherGenericBase {
|
||||
MatchAllOfGeneric(MatcherTs const&... matchers) : m_matchers{std::addressof(matchers)...} {}
|
||||
explicit MatchAllOfGeneric(std::array<void const*, sizeof...(MatcherTs)> matchers) : m_matchers{matchers} {}
|
||||
|
||||
@ -125,7 +125,7 @@ namespace Matchers {
|
||||
|
||||
|
||||
template<typename... MatcherTs>
|
||||
struct MatchAnyOfGeneric : MatcherGenericBase {
|
||||
struct MatchAnyOfGeneric final : MatcherGenericBase {
|
||||
MatchAnyOfGeneric(MatcherTs const&... matchers) : m_matchers{std::addressof(matchers)...} {}
|
||||
explicit MatchAnyOfGeneric(std::array<void const*, sizeof...(MatcherTs)> matchers) : m_matchers{matchers} {}
|
||||
|
||||
@ -143,7 +143,7 @@ namespace Matchers {
|
||||
|
||||
|
||||
template<typename MatcherT>
|
||||
struct MatchNotOfGeneric : MatcherGenericBase {
|
||||
struct MatchNotOfGeneric final : MatcherGenericBase {
|
||||
explicit MatchNotOfGeneric(MatcherT const& matcher) : m_matcher{matcher} {}
|
||||
|
||||
template<typename Arg>
|
||||
|
Loading…
Reference in New Issue
Block a user