Compilation error fixes following merge with next.

diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index 9cbf9f6facfe84b876e62495e60a41c9d325467a..3d443d08fa227456ee6a41227367bdb40dfd6633 100644 (file)
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -52,8 +52,8 @@ using std::random_shuffle;
 FGAirportDynamics::FGAirportDynamics(FGAirport * ap):
     _ap(ap), rwyPrefs(ap), SIDs(ap),
     atisSequenceIndex(-1),
-    atisSequenceTimeStamp(0.0)
-    startupController(this);
+    atisSequenceTimeStamp(0.0),
+    startupController(this)
 {
     lastUpdate = 0;
 }

diff --git a/src/Airports/dynamics.hxx b/src/Airports/dynamics.hxx
index 3240f09381dcc1708f8f86299544bd1ca9b1716c..d3dbedaa27b50256e600b5215632e7bf0cf1f1a3 100644 (file)
--- a/src/Airports/dynamics.hxx
+++ b/src/Airports/dynamics.hxx
@@ -58,23 +58,15 @@ private:
   intVec freqTower;    // </TOWER>
   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;
   double atisSequenceTimeStamp;
   
   std::string chooseRunwayFallback();
   bool innerGetActiveRunway(const std::string &trafficType, int action, std::string &runway, double heading);
   std::string chooseRwyByHeading(stringVec rwys, double heading);
->>>>>>> next:src/Airports/dynamics.hxx
+
+  double elevation;
+
 public:
   FGAirportDynamics(FGAirport* ap);
   ~FGAirportDynamics();