fly/flightgear
1
0
Fork 0
Code Activity

Fix SID class ambiguity on Windows (clashes with winnt.h)

Browse source
This commit is contained in:
James Turner 2012-05-07 00:59:28 +01:00
parent 1b7b69b498
commit b092987656
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Autopilot/route_mgr.cxx
View file

@ -1025,7 +1025,7 @@ void FGRouteMgr::setSID(const char* aIdent)
{ {
FGAirport* apt = _plan->departureAirport(); FGAirport* apt = _plan->departureAirport();
if (!apt || (aIdent == NULL)) { if (!apt || (aIdent == NULL)) {
_plan->setSID((SID*) NULL); _plan->setSID((flightgear::SID*) NULL);
return; return;
} }
@ -1035,7 +1035,7 @@ void FGRouteMgr::setSID(const char* aIdent)
string sidIdent = ident.substr(0, hyphenPos); string sidIdent = ident.substr(0, hyphenPos);
string transIdent = ident.substr(hyphenPos + 1); string transIdent = ident.substr(hyphenPos + 1);
SID* sid = apt->findSIDWithIdent(sidIdent); flightgear::SID* sid = apt->findSIDWithIdent(sidIdent);
Transition* trans = sid ? sid->findTransitionByName(transIdent) : NULL; Transition* trans = sid ? sid->findTransitionByName(transIdent) : NULL;
_plan->setSID(trans); _plan->setSID(trans);
} else { } else {