From f383fe081e8ec066f3c59d397c34323f7632ac1f Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Wed, 26 Dec 2018 02:09:50 +0100
Subject: [PATCH] switch to cmath and std::isnan

---
 src/tabcontrollers/ChaperoneTabController.cpp | 12 ++++++------
 src/utils/ChaperoneUtils.cpp                  |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index cbde2e2..92572bf 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -1,7 +1,7 @@
 #include "ChaperoneTabController.h"
 #include <QQuickWindow>
 #include "../overlaycontroller.h"
-#include <math.h>
+#include <cmath>
 
 // application namespace
 namespace advsettings {
@@ -361,7 +361,7 @@ void ChaperoneTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses,
 				poseHmd.mDeviceToAbsoluteTracking.m[1][3],
 				poseHmd.mDeviceToAbsoluteTracking.m[2][3]
 			});
-			if (!isnan(distanceHmd)) {
+			if (!std::isnan(distanceHmd)) {
 				minDistance = distanceHmd;
 			}
 		}
@@ -374,7 +374,7 @@ void ChaperoneTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses,
 					poseLeft.mDeviceToAbsoluteTracking.m[1][3],
 					poseLeft.mDeviceToAbsoluteTracking.m[2][3]
 				});
-				if (!isnan(distanceLeft) && (isnan(minDistance) || distanceLeft < minDistance)) {
+				if (!std::isnan(distanceLeft) && (std::isnan(minDistance) || distanceLeft < minDistance)) {
 					minDistance = distanceLeft;
 				}
 			}
@@ -388,12 +388,12 @@ void ChaperoneTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses,
 					poseRight.mDeviceToAbsoluteTracking.m[1][3],
 					poseRight.mDeviceToAbsoluteTracking.m[2][3]
 				});
-				if (!isnan(distanceRight) && (isnan(minDistance) || distanceRight < minDistance)) {
+				if (!std::isnan(distanceRight) && (std::isnan(minDistance) || distanceRight < minDistance)) {
 					minDistance = distanceRight;
 				}
 			}
 		}
-		if (!isnan(minDistance)) {
+		if (!std::isnan(minDistance)) {
 			handleChaperoneWarnings(minDistance);
 		}
 	}
@@ -1002,7 +1002,7 @@ float ChaperoneTabController::getBoundsMaxY() {
 			} else {
 				ci = 2;
 			}
-			if (isnan(result) || result < collisionBounds[b].vCorners[ci].v[1]) {
+			if (std::isnan(result) || result < collisionBounds[b].vCorners[ci].v[1]) {
 				result = collisionBounds[b].vCorners[ci].v[1];
 			}
 		}
diff --git a/src/utils/ChaperoneUtils.cpp b/src/utils/ChaperoneUtils.cpp
index a0cbf6c..832593a 100644
--- a/src/utils/ChaperoneUtils.cpp
+++ b/src/utils/ChaperoneUtils.cpp
@@ -1,7 +1,6 @@
-
 #include "ChaperoneUtils.h"
 #include <iostream>
-#include <math.h>
+#include <cmath>
 
 namespace utils {
 
@@ -43,7 +42,7 @@ float ChaperoneUtils::_getDistanceToChaperone(const vr::HmdVector3_t & x, vr::Hm
 			float d_z = x1_z - x.v[2];
 			d = sqrt(d_x*d_x + d_z*d_z);
 		}
-		if (isnan(distance) || d < distance) {
+		if (std::isnan(distance) || d < distance) {
 			distance = d;
 			if (projectedPoint) {
 				projectedPoint->v[0] = x1_x;