Portability: Fix compile errors on MSVC (cmath)

From Scott (xDraconian)
2015-03-24 11:11:42 -05:00 · 2015-03-24 11:11:42 -05:00 · f2d6b76b13
commit f2d6b76b13
parent 0cff350dab
28 changed files with 30 additions and 34 deletions
--- 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>
--- 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"
--- 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>

--- 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>
--- 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;

--- 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>

--- 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;

--- 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>
--- 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>

--- 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>

--- 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;
--- 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() : 
--- 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;
--- 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 {

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>