isnan.h

stuntrally · Feb 12, 2017 · be5fb07 · be5fb07
1 parent 4df36d6
commit be5fb07
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/source/vdrift/cardefs.h b/source/vdrift/cardefs.h
@@ -40,13 +40,6 @@ enum EPerfTest {PT_StartWait, PT_Accel, PT_Brake};
 
 const int Ncrashsounds = 12, Nwatersounds = 3;
 
-#ifdef _WIN32
-static bool isnan(float number)  {  return (number != number);  }
-static bool isnan(double number) {  return (number != number);  }
-#else  // gcc, c++11
-#define isnan(f)  std::isnan(f)
-#endif
-
 const static char sCfgWh[MAX_WHEELS][4] = {"FL","FR","RL","RR","RL2","RR2","RL3","RR3"};  // .car config wheel names
 
 const int PAR_BOOST = 2, PAR_THRUST = 4;  // max particles for boost and spc thrusters
diff --git a/source/vdrift/cardynamics_simulate.cpp b/source/vdrift/cardynamics_simulate.cpp
@@ -3,6 +3,7 @@
 #include "cardynamics.h"
 #include "tobullet.h"
 #include "../ogre/common/Def_Str.h"
+#include "isnan.h"
 
 
 //  set the steering angle,  left -1..1 right

diff --git a/source/vdrift/cartire.cpp b/source/vdrift/cartire.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 #include "cartire.h"
 #include "cardefs.h"
-#include <cmath>
 //#include "../ogre/common/Def_Str.h"
+#include "isnan.h"
 
 
 void CARTIRE::FindSigmaHatAlphaHat(Dbl load, Dbl & output_sigmahat, Dbl & output_alphahat, int iterations)

diff --git a/source/vdrift/isnan.h b/source/vdrift/isnan.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#ifdef _WIN32
+	static bool isnan(float number)  {  return (number != number);  }
+	static bool isnan(double number) {  return (number != number);  }
+#else  // gcc, c++11
+	#include <cmath>
+	#define isnan(f)  std::isnan(f)
+#endif