]> git.mxchange.org Git - flightgear.git/commitdiff
Fix SID class ambiguity on Windows (clashes with winnt.h)
authorJames Turner <zakalawe@mac.com>
Sun, 6 May 2012 23:59:28 +0000 (00:59 +0100)
committerJames Turner <zakalawe@mac.com>
Sun, 6 May 2012 23:59:28 +0000 (00:59 +0100)
src/Autopilot/route_mgr.cxx

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