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

Moved Approx into its own namespace to avoid ADL issues with operator ==

This commit is contained in:
Phil Nash 2011-04-04 07:56:44 +01:00
parent 3c08431c92
commit 01db6c4471
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catch.hpp
View File

@ -66,6 +66,6 @@
// Still to be implemented
#define CHECK_NOFAIL( expr ) // !TBD - reports violation, but doesn't fail Test
using Catch::Approx;
using Catch::Detail::Approx;
#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED

82
internal/catch_capture.hpp
View File

@ -591,53 +591,55 @@ inline double catch_max( double x, double y )
{
return x > y ? x : y;
}
class Approx
namespace Detail
{
public:
///////////////////////////////////////////////////////////////////////////
// !TBD more generic
explicit Approx
(
double d
)
: m_d( d )
class Approx
{
}
public:
///////////////////////////////////////////////////////////////////////////
// !TBD more generic
explicit Approx
(
double d
)
: m_d( d )
{
}
///////////////////////////////////////////////////////////////////////////
template<typename T>
friend bool operator ==
(
const T& lhs,
const Approx& rhs
)
{
// !TBD Use proper tolerance
// From: http://realtimecollisiondetection.net/blog/?p=89
// see also: http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
return fabs( lhs - rhs.m_d ) <= catch_max( CATCH_absTol, CATCH_relTol * catch_max( fabs(lhs), fabs(rhs.m_d) ) );
}
///////////////////////////////////////////////////////////////////////////
template<typename T>
friend bool operator ==
(
const T& lhs,
const Approx& rhs
)
{
// !TBD Use proper tolerance
// From: http://realtimecollisiondetection.net/blog/?p=89
// see also: http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
return fabs( lhs - rhs.m_d ) <= catch_max( CATCH_absTol, CATCH_relTol * catch_max( fabs(lhs), fabs(rhs.m_d) ) );
}
///////////////////////////////////////////////////////////////////////////
template<typename T>
friend bool operator !=
(
const T& lhs,
const Approx& rhs
)
{
return ! operator==( lhs, rhs );
}
double m_d;
};
}
///////////////////////////////////////////////////////////////////////////
template<typename T>
friend bool operator !=
(
const T& lhs,
const Approx& rhs
)
{
return ! operator==( lhs, rhs );
}
double m_d;
};
///////////////////////////////////////////////////////////////////////////////
template<>
inline std::string toString<Approx>
inline std::string toString<Detail::Approx>
(
const Approx& value
const Detail::Approx& value
)
{
std::ostringstream oss;