From c9c2025d521974d623c4fee84ec1de3e4b3eb8d2 Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Fri, 2 Aug 2013 19:04:52 +0000 Subject: [PATCH] Swiched from isnan() check to isfinite() check for DOUBLES_EQUAL - also handles infinite case --- CppUnitLite/Test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CppUnitLite/Test.h b/CppUnitLite/Test.h index 82040dceb..3ea6a6318 100644 --- a/CppUnitLite/Test.h +++ b/CppUnitLite/Test.h @@ -130,7 +130,7 @@ boost::lexical_cast(actualTemp))); return; } } #define DOUBLES_EQUAL(expected,actual,threshold)\ { double actualTemp = actual; \ double expectedTemp = expected; \ - if (isnan(actualTemp) || isnan(expectedTemp) || fabs ((expectedTemp)-(actualTemp)) > threshold) \ + if (!std::isfinite(actualTemp) || !std::isfinite(expectedTemp) || fabs ((expectedTemp)-(actualTemp)) > threshold) \ { result_.addFailure (Failure (name_, __FILE__, __LINE__, \ boost::lexical_cast((double)expectedTemp), boost::lexical_cast((double)actualTemp))); return; } } @@ -150,7 +150,7 @@ boost::lexical_cast(actualTemp))); } } #define EXPECT_DOUBLES_EQUAL(expected,actual,threshold)\ { double actualTemp = actual; \ double expectedTemp = expected; \ - if (isnan(actualTemp) || isnan(expectedTemp) || fabs ((expectedTemp)-(actualTemp)) > threshold) \ + if (!std::isfinite(actualTemp) || !std::isfinite(expectedTemp) || fabs ((expectedTemp)-(actualTemp)) > threshold) \ { result_.addFailure (Failure (name_, __FILE__, __LINE__, \ boost::lexical_cast((double)expectedTemp), boost::lexical_cast((double)actualTemp))); } }