mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
Removed <algorithm> include from the main path
This commit is contained in:
parent
287cc92b2c
commit
d01fe03ba6
@ -10,8 +10,6 @@
|
|||||||
|
|
||||||
#include "catch_matchers.hpp"
|
#include "catch_matchers.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
|
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
namespace Matchers {
|
namespace Matchers {
|
||||||
|
|
||||||
@ -23,7 +21,12 @@ namespace Matchers {
|
|||||||
ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
|
ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
|
||||||
|
|
||||||
bool match(std::vector<T> const &v) const override {
|
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 {
|
std::string describe() const override {
|
||||||
@ -42,9 +45,18 @@ namespace Matchers {
|
|||||||
// !TBD: see note in EqualsMatcher
|
// !TBD: see note in EqualsMatcher
|
||||||
if (m_comparator.size() > v.size())
|
if (m_comparator.size() > v.size())
|
||||||
return false;
|
return false;
|
||||||
for ( auto const& comparator : m_comparator )
|
for (auto const& comparator : m_comparator) {
|
||||||
if (std::find(v.begin(), v.end(), comparator) == v.end())
|
auto present = false;
|
||||||
|
for (const auto& el : v) {
|
||||||
|
if (el == comparator) {
|
||||||
|
present = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!present) {
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
std::string describe() const override {
|
std::string describe() const override {
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
TEST_CASE( "random SECTION tests", "[.][sections][failing]" ) {
|
TEST_CASE( "random SECTION tests", "[.][sections][failing]" ) {
|
||||||
int a = 1;
|
int a = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user