3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 20:27:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed <algorithm> include from the main path

Browse Source
This commit is contained in:
Martin Hořeňovský
2017-07-28 15:11:05 +02:00
parent 287cc92b2c
commit d01fe03ba6
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/internal/catch_matchers_vector.h
View File

@@ -10,8 +10,6 @@
#include "catch_matchers.hpp"
#include <algorithm>
namespace Catch {
namespace Matchers {
@@ -23,7 +21,12 @@ namespace Matchers {
ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
bool match(std::vector<T> const &v) const override {
return std::find(v.begin(), v.end(), m_comparator) != v.end();
for (auto const& el : v) {
if (el == m_comparator) {
return true;
}
}
return false;
}
std::string describe() const override {
@@ -42,9 +45,18 @@ namespace Matchers {
// !TBD: see note in EqualsMatcher
if (m_comparator.size() > v.size())
return false;
for ( auto const& comparator : m_comparator )
if (std::find(v.begin(), v.end(), comparator) == v.end())
for (auto const& comparator : m_comparator) {
auto present = false;
for (const auto& el : v) {
if (el == comparator) {
present = true;
break;
}
}
if (!present) {
return false;
}
}
return true;
}
std::string describe() const override {