3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings generated with -Wshadow

This commit is contained in:
Stephen Newell 2019-01-13 08:54:23 -07:00 committed by Martin Hořeňovský
parent c3c82f539c
commit d6fce7bf34
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/internal/catch_approx.cpp
View File

@ -55,18 +55,18 @@ namespace Detail {
return marginComparison(m_value, other, m_margin) || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(m_value))); return marginComparison(m_value, other, m_margin) || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(m_value)));
} }
void Approx::setMargin(double margin) { void Approx::setMargin(double newMargin) {
CATCH_ENFORCE(margin >= 0, CATCH_ENFORCE(newMargin >= 0,
"Invalid Approx::margin: " << margin << '.' "Invalid Approx::margin: " << newMargin << '.'
<< " Approx::Margin has to be non-negative."); << " Approx::Margin has to be non-negative.");
m_margin = margin; m_margin = newMargin;
} }
void Approx::setEpsilon(double epsilon) { void Approx::setEpsilon(double newEpsilon) {
CATCH_ENFORCE(epsilon >= 0 && epsilon <= 1.0, CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
"Invalid Approx::epsilon: " << epsilon << '.' "Invalid Approx::epsilon: " << newEpsilon << '.'
<< " Approx::epsilon has to be in [0, 1]"); << " Approx::epsilon has to be in [0, 1]");
m_epsilon = epsilon; m_epsilon = newEpsilon;
} }
} // end namespace Detail } // end namespace Detail

6
projects/SelfTest/UsageTests/Message.tests.cpp
View File

@ -227,9 +227,9 @@ TEST_CASE( "CAPTURE can deal with complex expressions", "[messages][capture]" )
template <typename T1, typename T2> template <typename T1, typename T2>
struct helper_1436 { struct helper_1436 {
helper_1436(T1 t1, T2 t2): helper_1436(T1 t1_, T2 t2_):
t1{ t1 }, t1{ t1_ },
t2{ t2 } t2{ t2_ }
{} {}
T1 t1; T1 t1;
T2 t2; T2 t2;