3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 21:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sweep out Wshadow

Browse Source 
Most of the changes are completely pointless renaming of constructor
arguments so that they do not use the same name as the type members,
but 🤷

Closes #2015
This commit is contained in:
Martin Hořeňovský
2020-09-06 13:10:43 +02:00
parent 90aeffb97d
commit cc18bd719d
12 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/SelfTest/UsageTests/Matchers.tests.cpp
View File

@@ -711,22 +711,22 @@ namespace { namespace MatchersTests {
template<typename Range>
struct EqualsRangeMatcher : Catch::Matchers::MatcherGenericBase {
EqualsRangeMatcher(Range const& range) : range{ range } {}
EqualsRangeMatcher(Range const& range) : m_range{ range } {}
template<typename OtherRange>
bool match(OtherRange const& other) const {
using std::begin;
using std::end;
return std::equal(begin(range), end(range), begin(other), end(other));
return std::equal(begin(m_range), end(m_range), begin(other), end(other));
}
std::string describe() const override {
return "Equals: " + Catch::rangeToString(range);
return "Equals: " + Catch::rangeToString(m_range);
}
private:
Range const& range;
Range const& m_range;
};
template<typename Range>
@@ -750,8 +750,8 @@ namespace { namespace MatchersTests {
std::array<int, 3> a{{ 5, 3, 1 }};
REQUIRE_THAT(vec,
Predicate<std::vector<int>>([](auto const& vec) {
return std::all_of(vec.begin(), vec.end(), [](int elem) {
Predicate<std::vector<int>>([](auto const& v) {
return std::all_of(v.begin(), v.end(), [](int elem) {
return elem % 2 == 1;
});
}, "All elements are odd") &&
@@ -948,7 +948,7 @@ namespace { namespace MatchersTests {
TEST_CASE("Overloaded comma or address-of operators are not used", "[matchers][templated]") {
REQUIRE_THROWS_AS((EvilMatcher(), EvilMatcher()), EvilCommaOperatorUsed);
REQUIRE_THROWS_AS(&EvilMatcher(), EvilAddressOfOperatorUsed);
REQUIRE_NOTHROW(EvilMatcher() || EvilMatcher() && !EvilMatcher());
REQUIRE_NOTHROW(EvilMatcher() || (EvilMatcher() && !EvilMatcher()));
REQUIRE_NOTHROW((EvilMatcher() && EvilMatcher()) || !EvilMatcher());
}