From: James Turner <zakalawe@mac.com>
Date: Tue, 24 Mar 2015 16:11:42 +0000 (-0500)
Subject: Portability: Fix compile errors on MSVC (cmath)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2d6b76b13d0bf4d96477761b66b5d30b1fcbd26;p=flightgear.git

Portability: Fix compile errors on MSVC (cmath)

From Scott (xDraconian)
---

diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx
index e99381712..07866c395 100644
--- a/src/AIModel/AIBallistic.hxx
+++ b/src/AIModel/AIBallistic.hxx
@@ -22,7 +22,7 @@
 #ifndef _FG_AIBALLISTIC_HXX
 #define _FG_AIBALLISTIC_HXX
 
-#include <math.h>
+#include <cmath>
 #include <vector>
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/scene/material/mat.hxx>
diff --git a/src/AIModel/AICarrier.cxx b/src/AIModel/AICarrier.cxx
index fae5d26bc..e8639395a 100644
--- a/src/AIModel/AICarrier.cxx
+++ b/src/AIModel/AICarrier.cxx
@@ -28,7 +28,7 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_geodesy.hxx>
 
-#include <math.h>
+#include <cmath>
 #include <Main/util.hxx>
 
 #include "AICarrier.hxx"
diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx
index 9a8166755..44e53c849 100644
--- a/src/AIModel/AIEscort.cxx
+++ b/src/AIModel/AIEscort.cxx
@@ -30,7 +30,7 @@
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/sg_random.h>
 
-#include <math.h>
+#include <cmath>
 #include <Main/util.hxx>
 #include <Viewer/viewer.hxx>
 
diff --git a/src/AIModel/AIGroundVehicle.hxx b/src/AIModel/AIGroundVehicle.hxx
index fcb822a3c..40cbe1994 100644
--- a/src/AIModel/AIGroundVehicle.hxx
+++ b/src/AIModel/AIGroundVehicle.hxx
@@ -21,7 +21,7 @@
 #ifndef _FG_AIGROUNDVEHICLE_HXX
 #define _FG_AIGROUNDVEHICLE_HXX
 
-#include <math.h>
+#include <cmath>
 #include <vector>
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/scene/material/mat.hxx>
diff --git a/src/AIModel/AIStatic.cxx b/src/AIModel/AIStatic.cxx
index 5ac1f4ce3..5da570732 100644
--- a/src/AIModel/AIStatic.cxx
+++ b/src/AIModel/AIStatic.cxx
@@ -26,7 +26,7 @@
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <string>
-#include <math.h>
+#include <cmath>
 
 using std::string;
 
diff --git a/src/AIModel/AIStorm.cxx b/src/AIModel/AIStorm.cxx
index e11411777..cbb4225cc 100644
--- a/src/AIModel/AIStorm.cxx
+++ b/src/AIModel/AIStorm.cxx
@@ -26,7 +26,7 @@
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <string>
-#include <math.h>
+#include <cmath>
 #include <cstdlib>
 #include <time.h>
 
diff --git a/src/AIModel/AIThermal.cxx b/src/AIModel/AIThermal.cxx
index 7007bb249..4e8e63b2e 100644
--- a/src/AIModel/AIThermal.cxx
+++ b/src/AIModel/AIThermal.cxx
@@ -28,7 +28,7 @@
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <string>
-#include <math.h>
+#include <cmath>
 
 using std::string;
 
diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx
index 3c692629a..7f82d2da2 100644
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@@ -24,7 +24,7 @@
 #  include <config.h>
 #endif
 
-#include <math.h>
+#include <cmath>
 #include <algorithm>
 #include <fstream>
 #include <map>
diff --git a/src/Airports/runwayprefs.cxx b/src/Airports/runwayprefs.cxx
index e6f1eb68a..3353820a7 100644
--- a/src/Airports/runwayprefs.cxx
+++ b/src/Airports/runwayprefs.cxx
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#include <math.h>
+#include <cmath>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index 5707eea96..60c7001be 100644
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include <boost/tuple/tuple.hpp>
 
diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index edbeb57c9..08e0b7fe2 100644
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -26,11 +26,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/tiedpropertylist.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
+#include <cmath>
 
 class FGEnvironment;
 class FGClouds;
diff --git a/src/Environment/fgwind.cxx b/src/Environment/fgwind.cxx
index 43a67c494..687a7ae41 100644
--- a/src/Environment/fgwind.cxx
+++ b/src/Environment/fgwind.cxx
@@ -20,7 +20,7 @@
 //
 // $Id$
 #include "fgwind.hxx"
-#include <math.h>
+#include <cmath>
 #include <stdio.h>
 
 FGWindModulator::FGWindModulator() : 
diff --git a/src/Environment/ridge_lift.cxx b/src/Environment/ridge_lift.cxx
index 2a26af5af..bb461216d 100644
--- a/src/Environment/ridge_lift.cxx
+++ b/src/Environment/ridge_lift.cxx
@@ -35,7 +35,7 @@
 #include <Main/util.hxx>
 #include <Scenery/scenery.hxx>
 #include <string>
-#include <math.h>
+#include <cmath>
 #include <simgear/sg_inlines.h>
 
 using std::string;
diff --git a/src/FDM/YASim/Math.hpp b/src/FDM/YASim/Math.hpp
index ab1f39b2d..82bad4c5c 100644
--- a/src/FDM/YASim/Math.hpp
+++ b/src/FDM/YASim/Math.hpp
@@ -1,7 +1,7 @@
 #ifndef _MATH_HPP
 #define _MATH_HPP
 
-#include <math.h>
+#include <cmath>
 
 namespace yasim {
 
diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 2d291b3cf..01ee34ccc 100644
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -73,7 +73,7 @@
  */
 
 
-#include <math.h>
+#include <cmath>
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 59effd534..d849f3ce6 100644
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -32,7 +32,7 @@
 #  include <winsock2.h>
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include <iostream>
 #include <fstream>
diff --git a/src/Instrumentation/airspeed_indicator.cxx b/src/Instrumentation/airspeed_indicator.cxx
index 2879f73b7..7672f75bd 100644
--- a/src/Instrumentation/airspeed_indicator.cxx
+++ b/src/Instrumentation/airspeed_indicator.cxx
@@ -8,7 +8,7 @@
 #  include "config.h"
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include <simgear/constants.h>
 #include <simgear/math/interpolater.hxx>
diff --git a/src/Instrumentation/attitude_indicator.cxx b/src/Instrumentation/attitude_indicator.cxx
index de79e811d..3720c2c82 100644
--- a/src/Instrumentation/attitude_indicator.cxx
+++ b/src/Instrumentation/attitude_indicator.cxx
@@ -16,7 +16,7 @@
 #include <string>
 #include <sstream>
 
-#include <math.h>	// fabs()
+#include <cmath>    // fabs()
 
 #include "attitude_indicator.hxx"
 #include <Main/fg_props.hxx>
diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index d14748ce9..5c18cf063 100644
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -58,7 +58,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <string>
 #include <sstream>
diff --git a/src/Instrumentation/mrg.cxx b/src/Instrumentation/mrg.cxx
index 8a77fc175..3f914b282 100644
--- a/src/Instrumentation/mrg.cxx
+++ b/src/Instrumentation/mrg.cxx
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
-#include <math.h>	// fabs()
+#include <cmath>    // fabs()
 
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
diff --git a/src/Instrumentation/tcas.cxx b/src/Instrumentation/tcas.cxx
index 91ec0f210..ce16ce5a4 100644
--- a/src/Instrumentation/tcas.cxx
+++ b/src/Instrumentation/tcas.cxx
@@ -91,7 +91,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <string>
 #include <sstream>
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 9b69c16b7..ee3b3aafa 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -33,10 +33,10 @@
 
 #include <boost/foreach.hpp>
 
-#include <math.h>		// rint()
+#include <cmath>        // rint()
 #include <stdio.h>
-#include <stdlib.h>		// atof(), atoi()
-#include <string.h>		// strcmp()
+#include <stdlib.h>     // atof(), atoi()
+#include <string.h>     // strcmp()
 #include <algorithm>
 
 #include <iostream>
diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index a3ea1b9e8..419060991 100644
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -23,7 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#include <math.h>
+#include <cmath>
 
 #include <cstdlib>
 
diff --git a/src/Network/ATC-Inputs.cxx b/src/Network/ATC-Inputs.cxx
index be59770f8..0e34f1a52 100644
--- a/src/Network/ATC-Inputs.cxx
+++ b/src/Network/ATC-Inputs.cxx
@@ -37,7 +37,7 @@
 #endif
 
 #include <errno.h>
-#include <math.h>
+#include <cmath>
 #include <cstdio>
 
 #include <string>
diff --git a/src/Network/ATC-Outputs.cxx b/src/Network/ATC-Outputs.cxx
index dd9e32cdd..9fa1046a1 100644
--- a/src/Network/ATC-Outputs.cxx
+++ b/src/Network/ATC-Outputs.cxx
@@ -38,7 +38,7 @@
 #endif
 
 #include <errno.h>
-#include <math.h>
+#include <cmath>
 
 #include <string>
 #include <cstdio>
diff --git a/src/Radio/antenna.cxx b/src/Radio/antenna.cxx
index fa5e00110..eb74d2fc2 100644
--- a/src/Radio/antenna.cxx
+++ b/src/Radio/antenna.cxx
@@ -21,7 +21,7 @@
 #  include <config.h>
 #endif
 
-#include <math.h>
+#include <cmath>
 #include <iostream>
 #include <stdlib.h>
 #include <fstream>
diff --git a/src/Radio/radio.cxx b/src/Radio/radio.cxx
index 62f233edf..5fa44f30f 100644
--- a/src/Radio/radio.cxx
+++ b/src/Radio/radio.cxx
@@ -22,7 +22,7 @@
 #  include <config.h>
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include <stdlib.h>
 #include <deque>
diff --git a/src/Sound/voiceplayer.cxx b/src/Sound/voiceplayer.cxx
index 583443ded..ab839cca6 100644
--- a/src/Sound/voiceplayer.cxx
+++ b/src/Sound/voiceplayer.cxx
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <string>
 #include <sstream>