MSVC (warning) fixes.
This commit is contained in:
parent
b5bfbcf706
commit
02a757f9e6
7 changed files with 24 additions and 12 deletions
|
@ -33,6 +33,10 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# include <float.h>
|
||||||
|
# define finite _finite
|
||||||
|
#endif
|
||||||
|
|
||||||
SG_USING_STD(string);
|
SG_USING_STD(string);
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
#include <AIFlightPlan.hxx>
|
#include "AIFlightPlan.hxx"
|
||||||
#include <simgear/math/sg_geodesy.hxx>
|
#include <simgear/math/sg_geodesy.hxx>
|
||||||
#include <Airports/runways.hxx>
|
#include <Airports/runways.hxx>
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,11 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# define _USE_MATH_DEFINES
|
||||||
|
#endif
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include <simgear/compiler.h>
|
#include <simgear/compiler.h>
|
||||||
#include <Environment/environment_mgr.hxx>
|
#include <Environment/environment_mgr.hxx>
|
||||||
|
@ -45,7 +49,7 @@
|
||||||
|
|
||||||
#include "simple.hxx"
|
#include "simple.hxx"
|
||||||
|
|
||||||
SG_USING_NAMESPACE(std);
|
SG_USING_STD(sort);
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* ScheduleTime
|
* ScheduleTime
|
||||||
|
@ -192,6 +196,7 @@ RunwayGroup& RunwayGroup:: operator= (const RunwayGroup &other)
|
||||||
choice[0] = other.choice[0];
|
choice[0] = other.choice[0];
|
||||||
choice[1] = other.choice[1];
|
choice[1] = other.choice[1];
|
||||||
nrActive = other.nrActive;
|
nrActive = other.nrActive;
|
||||||
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RunwayGroup::setActive(string aptId,
|
void RunwayGroup::setActive(string aptId,
|
||||||
|
@ -399,6 +404,7 @@ ScheduleTime *FGRunwayPreference::getSchedule(const char *trafficType)
|
||||||
if (!(strcmp(trafficType, "mil"))) {
|
if (!(strcmp(trafficType, "mil"))) {
|
||||||
return &milTimes;
|
return &milTimes;
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
RunwayGroup *FGRunwayPreference::getGroup(const string groupName)
|
RunwayGroup *FGRunwayPreference::getGroup(const string groupName)
|
||||||
|
@ -620,16 +626,16 @@ FGAirport::FGAirport(const FGAirport& other)
|
||||||
_elevation = other._elevation;
|
_elevation = other._elevation;
|
||||||
_name = other._name;
|
_name = other._name;
|
||||||
_has_metar = other._has_metar;
|
_has_metar = other._has_metar;
|
||||||
for (FGParkingVecConstIterator i= other.parkings.begin(); i != other.parkings.end(); i++)
|
for (FGParkingVecConstIterator ip= other.parkings.begin(); ip != other.parkings.end(); ip++)
|
||||||
parkings.push_back(*(i));
|
parkings.push_back(*(ip));
|
||||||
rwyPrefs = other.rwyPrefs;
|
rwyPrefs = other.rwyPrefs;
|
||||||
lastUpdate = other.lastUpdate;
|
lastUpdate = other.lastUpdate;
|
||||||
|
|
||||||
stringVecConstIterator i;
|
stringVecConstIterator il;
|
||||||
for (i = other.landing.begin(); i != other.landing.end(); i++)
|
for (il = other.landing.begin(); il != other.landing.end(); il++)
|
||||||
landing.push_back(*i);
|
landing.push_back(*il);
|
||||||
for (i = other.takeoff.begin(); i != other.takeoff.end(); i++)
|
for (il = other.takeoff.begin(); il != other.takeoff.end(); il++)
|
||||||
takeoff.push_back(*i);
|
takeoff.push_back(*il);
|
||||||
lastUpdate = other.lastUpdate;
|
lastUpdate = other.lastUpdate;
|
||||||
for (int i = 0; i < 10; i++)
|
for (int i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
namespace yasim {
|
namespace yasim {
|
||||||
|
|
||||||
class RigidBody;
|
class RigidBody;
|
||||||
class State;
|
struct State;
|
||||||
|
|
||||||
// A landing gear has the following parameters:
|
// A landing gear has the following parameters:
|
||||||
//
|
//
|
||||||
|
|
|
@ -5,7 +5,7 @@ namespace yasim {
|
||||||
|
|
||||||
class Ground;
|
class Ground;
|
||||||
class RigidBody;
|
class RigidBody;
|
||||||
class State;
|
struct State;
|
||||||
|
|
||||||
// A landing hook has the following parameters:
|
// A landing hook has the following parameters:
|
||||||
//
|
//
|
||||||
|
|
|
@ -5,7 +5,7 @@ namespace yasim {
|
||||||
|
|
||||||
class Ground;
|
class Ground;
|
||||||
class RigidBody;
|
class RigidBody;
|
||||||
class State;
|
struct State;
|
||||||
|
|
||||||
// A launchbar has the following parameters:
|
// A launchbar has the following parameters:
|
||||||
//
|
//
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include <plib/sg.h>
|
#include <plib/sg.h>
|
||||||
|
|
||||||
|
@ -63,6 +64,7 @@
|
||||||
|
|
||||||
#include "TrafficMgr.hxx"
|
#include "TrafficMgr.hxx"
|
||||||
|
|
||||||
|
SG_USING_STD(sort);
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* TrafficManager
|
* TrafficManager
|
||||||
|
|
Loading…
Reference in a new issue