fly/flightgear
1
0
Fork 0
Code Activity

Compilation error fixes following merge with next.

Browse source
This commit is contained in:
Durk Talsma 2011-06-03 10:02:18 +02:00
parent 348ff2ec23
commit 2f3faf4b8a
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Airports/dynamics.cxx
View file

@ -52,8 +52,8 @@ using std::random_shuffle;
FGAirportDynamics::FGAirportDynamics(FGAirport * ap): FGAirportDynamics::FGAirportDynamics(FGAirport * ap):
_ap(ap), rwyPrefs(ap), SIDs(ap), _ap(ap), rwyPrefs(ap), SIDs(ap),
atisSequenceIndex(-1), atisSequenceIndex(-1),
atisSequenceTimeStamp(0.0) atisSequenceTimeStamp(0.0),
startupController(this); startupController(this)
{ {
lastUpdate = 0; lastUpdate = 0;
} }

14
src/Airports/dynamics.hxx
View file

@ -58,23 +58,15 @@ private:
intVec freqTower; // </TOWER> intVec freqTower; // </TOWER>
intVec freqApproach; // </APPROACH> intVec freqApproach; // </APPROACH>
<<<<<<< HEAD:src/Airports/dynamics.hxx
string atisInformation;
string chooseRunwayFallback();
bool innerGetActiveRunway(const string &trafficType, int action, string &runway, double heading);
string chooseRwyByHeading(stringVec rwys, double heading);
double elevation;
=======
int atisSequenceIndex; int atisSequenceIndex;
double atisSequenceTimeStamp; double atisSequenceTimeStamp;
std::string chooseRunwayFallback(); std::string chooseRunwayFallback();
bool innerGetActiveRunway(const std::string &trafficType, int action, std::string &runway, double heading); bool innerGetActiveRunway(const std::string &trafficType, int action, std::string &runway, double heading);
std::string chooseRwyByHeading(stringVec rwys, double heading); std::string chooseRwyByHeading(stringVec rwys, double heading);
>>>>>>> next:src/Airports/dynamics.hxx
double elevation;
public: public:
FGAirportDynamics(FGAirport* ap); FGAirportDynamics(FGAirport* ap);
~FGAirportDynamics(); ~FGAirportDynamics();