From b09298765659035ac521a3f3847f2a70b7cd6f86 Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 7 May 2012 00:59:28 +0100 Subject: [PATCH] Fix SID class ambiguity on Windows (clashes with winnt.h) --- src/Autopilot/route_mgr.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx index 80313d70a..964f1354c 100644 --- a/src/Autopilot/route_mgr.cxx +++ b/src/Autopilot/route_mgr.cxx @@ -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 {