Portability: Fix compile errors on MSVC (cmath)

From Scott (xDraconian)

diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx
index e9938171266a1ad3c1fb9ea9b7e662b9312f853c..07866c395bd2bd882333c050f36ddf3a8d217eef 100644 (file)
--- 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 fae5d26bc38b91b76ee9028d99b8d091a117ca78..e8639395a69f1926ec44fc5aecd64c992e0e251d 100644 (file)
--- 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 9a816675597d88283aad6a25b43bb5b28472840c..44e53c849a29c4e3a05a1423081bf9debafab38e 100644 (file)
--- 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 fcb822a3cca0396336e4a8d9f80a88955cd95e55..40cbe1994f701ba7a603e42af1820692f1cc64b3 100644 (file)
--- 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 5ac1f4ce3aa2a78e007eb4208e9250050a315640..5da57073208b5bc0bc18d52062de8e37999a3c4e 100644 (file)
--- 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 e11411777f9493555b97be843f023e24754ca34e..cbb4225ccd3367547c2d8161a064fd9c36f423f5 100644 (file)
--- 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 7007bb2491c9ecc79a3ae7a5351134e464895585..4e8e63b2e43d9c326d22358d08ce8eae9da4873c 100644 (file)
--- 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 3c692629a7d29de13731fd346e4add6fe095bc7d..7f82d2da266631c07f482b829b3d3c89954386b2 100644 (file)
--- 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 e6f1eb68a304af390eb76f5df8ece7dd2715e61d..3353820a7e124f08e1619078559e6c3c3161c120 100644 (file)
--- 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 5707eea96add221341050117603cfa10edd00b4c..60c7001be0585bb7f5b0974e9eb0b9b163d54125 100644 (file)
--- 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 edbeb57c952e9d0de021d76c6d83203d8bff5e67..08e0b7fe233e8d4ea85f8028f7b148145937c9c3 100644 (file)
--- 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 43a67c494333386c578e51cab8fcf81b55cdac03..687a7ae41301f291830de57ca90000fa02396c7e 100644 (file)
--- 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 2a26af5af960fef0a9f92bd3ab9980f343962df8..bb461216de5626af37a74b7c3f6584fce00ad422 100644 (file)
--- 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 ab1f39b2d6d2aa362240e757e024997dfe1cd042..82bad4c5c73a3f65268ca5a1c50dc53021bc4add 100644 (file)
--- 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 2d291b3cf98df637efaf195e1c202778ac3f7293..01ee34ccc4ec8303f1bdaa28aaac3b2d52fdc1f1 100644 (file)
--- 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 59effd534ddf7cd080160ef3fe41eb7fd79f3b94..d849f3ce61f03726794a2e0a67be2bfc9312efb8 100644 (file)
--- 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 2879f73b74bb6269b305517d16d0b452d72e053a..7672f75bd8a97b298430b6523756176f90fd3fd9 100644 (file)
--- 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 de79e811df38e939f610c9b55d92569a0abb743f..3720c2c829eb167348c29eb3bab43955c20b2374 100644 (file)
--- 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 d14748ce9bfd2408c0faff24bc519eb06eca0a43..5c18cf063637dc31b59e0e07186917bea91d286e 100644 (file)
--- 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 8a77fc175263a6b6044bc6358c77713bddfac5eb..3f914b282b07b0edb35d2622ac1915f0559f79ea 100644 (file)
--- 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 91ec0f210d10760cd4bc1539a707e008bec5419f..ce16ce5a44dcef510bd7c3c14773a3efb2c227b9 100644 (file)
--- 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 9b69c16b7f348029fc92f5bb9e91e81a48480314..ee3b3aafaf1367676b4b355bb33eb63dc32ef636 100644 (file)
--- 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 a3ea1b9e8faa0f58b0dc388ba243c941e5132cc6..419060991e6deabdbf32c840e11939a547b2544a 100644 (file)
--- 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 be59770f89fda441e7f2b9bdc8a26da1acfe0afd..0e34f1a52da1a34af921612e9615f86d7d6d22a2 100644 (file)
--- 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 dd9e32cdd936ffee6ebf05ed1046cf30bedcb020..9fa1046a114df320344206e0adc489d835014d8a 100644 (file)
--- 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 fa5e00110ea53fe81d54400058fc26eb20097a88..eb74d2fc286209c073865be7041ad875f1204408 100644 (file)
--- 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 62f233edf6e542e4b975a28ec84e314fb25121f0..5fa44f30fb5faf9159b1e2f10bbc3cf75f937f6f 100644 (file)
--- 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 583443dedf8b542830172c4d694355cd1a834038..ab839cca6ffec20c59284a1ce551a58f88956989 100644 (file)
--- 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>