fly/flightgear
1
0
Fork 0
Code Activity

Fix Win32 compilation - avoid SID name clash with windows.h

Browse source
This commit is contained in:
James Turner 2010-10-20 13:13:05 +01:00
parent 308fd1b112
commit fe16732783
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Airports/simple.cxx
View file

@ -511,13 +511,13 @@ bool FGAirport::buildApproach(Waypt* aEnroute, STAR* aSTAR, FGRunway* aRwy, Wayp
return aps.front()->routeFromVectors(aRoute); return aps.front()->routeFromVectors(aRoute);
} }
pair<SID*, WayptRef> pair<flightgear::SID*, WayptRef>
FGAirport::selectSID(const SGGeod& aDest, FGRunway* aRwy) FGAirport::selectSID(const SGGeod& aDest, FGRunway* aRwy)
{ {
loadProcedures(); loadProcedures();
WayptRef enroute; WayptRef enroute;
SID* sid = NULL; flightgear::SID* sid = NULL;
double d = 1e9; double d = 1e9;
for (unsigned int i=0; i<mSIDs.size(); ++i) { for (unsigned int i=0; i<mSIDs.size(); ++i) {
@ -580,7 +580,7 @@ FGAirport::selectSTAR(const SGGeod& aOrigin, FGRunway* aRwy)
} }
void FGAirport::addSID(SID* aSid) void FGAirport::addSID(flightgear::SID* aSid)
{ {
mSIDs.push_back(aSid); mSIDs.push_back(aSid);
} }
@ -601,13 +601,13 @@ unsigned int FGAirport::numSIDs() const
return mSIDs.size(); return mSIDs.size();
} }
SID* FGAirport::getSIDByIndex(unsigned int aIndex) const flightgear::SID* FGAirport::getSIDByIndex(unsigned int aIndex) const
{ {
loadProcedures(); loadProcedures();
return mSIDs[aIndex]; return mSIDs[aIndex];
} }
SID* FGAirport::findSIDWithIdent(const std::string& aIdent) const flightgear::SID* FGAirport::findSIDWithIdent(const std::string& aIdent) const
{ {
loadProcedures(); loadProcedures();
for (unsigned int i=0; i<mSIDs.size(); ++i) { for (unsigned int i=0; i<mSIDs.size(); ++i) {

4
src/Autopilot/route_mgr.cxx
View file

@ -468,7 +468,7 @@ void FGRouteMgr::autoRoute()
_route.clear(); // clear out the existing, first _route.clear(); // clear out the existing, first
// SID // SID
SID* sid; flightgear::SID* sid;
WayptRef sidTrans; WayptRef sidTrans;
boost::tie(sid, sidTrans) = _departure->selectSID(_destination->geod(), runway); boost::tie(sid, sidTrans) = _departure->selectSID(_destination->geod(), runway);
@ -569,7 +569,7 @@ void FGRouteMgr::buildDeparture(WayptRef enroute, WayptVec& wps)
FGRunway* r = _departure->getRunwayByIdent(runwayId); FGRunway* r = _departure->getRunwayByIdent(runwayId);
string sidId = departure->getStringValue("sid"); string sidId = departure->getStringValue("sid");
SID* sid = _departure->findSIDWithIdent(sidId); flightgear::SID* sid = _departure->findSIDWithIdent(sidId);
if (!sid) { if (!sid) {
// valid runway, but no SID selected/found, so just the runway node for now // valid runway, but no SID selected/found, so just the runway node for now
if (!sidId.empty() && (sidId != "(none)")) { if (!sidId.empty() && (sidId != "(none)")) {