3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 15:26:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add parenthesis to prevent macro expansions of min/max

Browse Source 
Closes #1772
This commit is contained in:
Martin Hořeňovský 2019-10-17 11:21:17 +02:00
parent 91fa55303b
commit 31906d83ec
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_matchers_floating.cpp
View File

@ -142,7 +142,7 @@ namespace Floating {
WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType) WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
:m_target{ target }, m_ulps{ ulps }, m_type{ baseType } { :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
CATCH_ENFORCE(m_type == FloatingPointKind::Double CATCH_ENFORCE(m_type == FloatingPointKind::Double
|| m_ulps < std::numeric_limits<uint32_t>::max(), || m_ulps < (std::numeric_limits<uint32_t>::max)(),
"Provided ULP is impossibly large for a float comparison."); "Provided ULP is impossibly large for a float comparison.");
} }
@ -201,7 +201,7 @@ namespace Floating {
} }
bool WithinRelMatcher::match(double const& matchee) const { bool WithinRelMatcher::match(double const& matchee) const {
const auto relMargin = m_epsilon * std::max(std::fabs(matchee), std::fabs(m_target)); const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
return marginComparison(matchee, m_target, return marginComparison(matchee, m_target,
std::isinf(relMargin)? 0 : relMargin); std::isinf(relMargin)? 0 : relMargin);
} }

4
include/internal/catch_random_number_generator.h
View File

@ -20,10 +20,10 @@ namespace Catch {
using state_type = std::uint64_t; using state_type = std::uint64_t;
public: public:
using result_type = std::uint32_t; using result_type = std::uint32_t;
static constexpr result_type min() { static constexpr result_type (min)() {
return 0; return 0;
} }
static constexpr result_type max() { static constexpr result_type (max)() {
return static_cast<result_type>(-1); return static_cast<result_type>(-1);
} }