From b015d1e2fb5b3f3f537f2d76b610667b90cc0c89 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Fri, 15 Jul 2016 23:06:41 -0400 Subject: [PATCH] Use std::isnan/isinf, for C++11 compatibility. --- include/open_karto/Karto.h | 4 ++-- src/Mapper.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/open_karto/Karto.h b/include/open_karto/Karto.h index cdd8fce..4c45c54 100644 --- a/include/open_karto/Karto.h +++ b/include/open_karto/Karto.h @@ -5855,7 +5855,7 @@ namespace karto kt_double rangeReading = pScan->GetRangeReadings()[pointIndex]; kt_bool isEndPointValid = rangeReading < (rangeThreshold - KT_TOLERANCE); - if (rangeReading <= minRange || rangeReading >= maxRange || isnan(rangeReading)) + if (rangeReading <= minRange || rangeReading >= maxRange || std::isnan(rangeReading)) { // ignore these readings pointIndex++; @@ -6466,7 +6466,7 @@ namespace karto { const Vector2& rPosition = iter->GetPosition(); - if (isnan(pScan->GetRangeReadings()[readingIndex]) || isinf(pScan->GetRangeReadings()[readingIndex])) + if (std::isnan(pScan->GetRangeReadings()[readingIndex]) || std::isinf(pScan->GetRangeReadings()[readingIndex])) { pAngleIndexPointer[readingIndex] = INVALID_SCAN; readingIndex++; diff --git a/src/Mapper.cpp b/src/Mapper.cpp index efefaaf..db0c67b 100644 --- a/src/Mapper.cpp +++ b/src/Mapper.cpp @@ -929,7 +929,7 @@ namespace karto { Vector2 currentPoint = *iter; - if (firstTime && !isnan(currentPoint.GetX()) && !isnan(currentPoint.GetY())) + if (firstTime && !std::isnan(currentPoint.GetX()) && !std::isnan(currentPoint.GetY())) { firstPoint = currentPoint; firstTime = false;