- fixed ANSI C++ namespace problems

- added final newlines to files to avoid compiler warnings

- adjusted for FG_NEW_ENVIRONMENT

diff --git a/src/ATC/AIEntity.hxx b/src/ATC/AIEntity.hxx
index f3ac19b2dddce47fbcac60ce779428f73a377e3a..c7262c8f17ce27d137dd849e106914540c56fe1f 100644 (file)
--- a/src/ATC/AIEntity.hxx
+++ b/src/ATC/AIEntity.hxx
@@ -68,4 +68,5 @@ protected:
 
 };
 
-#endif  // _FG_AIEntity_HXX
\ No newline at end of file
+#endif  // _FG_AIEntity_HXX
+

diff --git a/src/ATC/AILocalTraffic.hxx b/src/ATC/AILocalTraffic.hxx
index fdbd2df46291037f3ff7ef6e46c49546f187adad..8d2e6d53757c1c77efd8f5785311dfb93ff22bbd 100644 (file)
--- a/src/ATC/AILocalTraffic.hxx
+++ b/src/ATC/AILocalTraffic.hxx
@@ -97,4 +97,4 @@ private:
 
 };
 
-#endif  // _FG_AILocalTraffic_HXX
\ No newline at end of file
+#endif  // _FG_AILocalTraffic_HXX

diff --git a/src/ATC/AIMgr.cxx b/src/ATC/AIMgr.cxx
index b4c341e8e99b001ea0ea965fcf5f29fc272bb6fd..e99f099946fbd10a985523170ef597d612574ce6 100644 (file)
--- a/src/ATC/AIMgr.cxx
+++ b/src/ATC/AIMgr.cxx
@@ -67,4 +67,4 @@ void FGAIMgr::update(int dt) {
        (*ai_list_itr)->Update();
        ++ai_list_itr;
     }
-}
\ No newline at end of file
+}

diff --git a/src/ATC/ATC.hxx b/src/ATC/ATC.hxx
index e3a573ec602be77e5086f543b7831a8e2faa4918..417058edae83348d44dade0723b5cec1d8a557a1 100644 (file)
--- a/src/ATC/ATC.hxx
+++ b/src/ATC/ATC.hxx
@@ -22,9 +22,14 @@
 #ifndef _FG_ATC_HXX
 #define _FG_ATC_HXX
 
+#include <simgear/compiler.h>
+
 #include <iostream>
 #include <string>
 
+SG_USING_STD(ostream);
+SG_USING_STD(string);
+
 // Possible types of ATC type that the radios may be tuned to.
 // INVALID implies not tuned in to anything.
 enum atc_type {

diff --git a/src/ATC/approach.cxx b/src/ATC/approach.cxx
index 5d9670687398c047b15a87c57f5aebe88a2e30be..4423894f76d7949a2164dfdfdd51aee885971582 100644 (file)
--- a/src/ATC/approach.cxx
+++ b/src/ATC/approach.cxx
@@ -185,7 +185,10 @@ void FGApproach::Update() {
 void FGApproach::get_active_runway() {
 
   sgVec3 position = { lat, lon, elev };
+
+#ifndef FG_NEW_ENVIRONMENT
   FGPhysicalProperty stationweather = WeatherDatabase->get(position);
+#endif
 
   SGPath path( globals->get_fg_root() );
   path.append( "Airports" );
@@ -193,8 +196,13 @@ void FGApproach::get_active_runway() {
   FGRunways runways( path.c_str() );
   
   //Set the heading to into the wind
+#ifndef FG_NEW_ENVIRONMENT
   double wind_x = stationweather.Wind[0];
   double wind_y = stationweather.Wind[1];
+#else
+  double wind_x = 0;
+  double wind_y = 0;           // FIXME
+#endif
   
   double speed = sqrt( wind_x*wind_x + wind_y*wind_y ) * SG_METER_TO_NM / (60.0*60.0);
   double hdg;
@@ -363,4 +371,4 @@ int FGApproach::RemovePlane() {
   }
   num_planes = np;
   return num_planes;
-}
\ No newline at end of file
+}

diff --git a/src/ATC/approach.hxx b/src/ATC/approach.hxx
index 8376ab3de4401afbacba83510ec7cbf517c99919..9b46ff8a7883ba23fd96b2957929b5f4c452badb 100644 (file)
--- a/src/ATC/approach.hxx
+++ b/src/ATC/approach.hxx
@@ -263,4 +263,4 @@ operator >> ( istream& in, FGApproach& a )
     return in >> skipeol;
 }
 
-#endif // _FG_APPROACH_HXX
\ No newline at end of file
+#endif // _FG_APPROACH_HXX

diff --git a/src/ATC/approachlist.cxx b/src/ATC/approachlist.cxx
index db399e526cf76cae74f742245aaf98ab1a898512..428847a37bef1f28c29a1d3927cdbd137c8f48a7 100644 (file)
--- a/src/ATC/approachlist.cxx
+++ b/src/ATC/approachlist.cxx
@@ -231,4 +231,4 @@ bool FGApproachList::get_name( string apt_id )
 
   return 0;
 
-}
\ No newline at end of file
+}

diff --git a/src/ATC/tower.hxx b/src/ATC/tower.hxx
index 2d66b091d08f326f95def8cdb599a85001f46632..58ba4d389417fb3fb42635b58e3c6192bf35b479 100644 (file)
--- a/src/ATC/tower.hxx
+++ b/src/ATC/tower.hxx
@@ -27,9 +27,11 @@
 #include <simgear/math/sg_geodesy.hxx>
 #include <plib/sg.h>
 
+#include <iostream>
 #include <string>
 
 SG_USING_STD(string);
+SG_USING_STD(ios);
 
 #include "ATC.hxx"
 
@@ -145,4 +147,4 @@ operator >> ( istream& in, FGTower& t )
 }
 
 
-#endif  //_FG_TOWER_HXX
\ No newline at end of file
+#endif  //_FG_TOWER_HXX

diff --git a/src/ATC/towerlist.cxx b/src/ATC/towerlist.cxx
index ba3b4c7b56492e9fc43998d9b44f5501fe8a195e..1ffba040501aced92604bbac0c518fc6da22f3ac 100644 (file)
--- a/src/ATC/towerlist.cxx
+++ b/src/ATC/towerlist.cxx
@@ -131,4 +131,4 @@ bool FGTowerList::query( double lon, double lat, double elev, double freq,
     }
 
     return false;
-}
\ No newline at end of file
+}

diff --git a/src/ATC/towerlist.hxx b/src/ATC/towerlist.hxx
index 5dc6e2fdb49be246c6f2384d32d811dd10b4750d..599f76967cd14de5d8703ae710d314227824572a 100644 (file)
--- a/src/ATC/towerlist.hxx
+++ b/src/ATC/towerlist.hxx
@@ -71,4 +71,4 @@ public:
 extern FGTowerList *current_towerlist;
 
 
-#endif // _FG_TOWERLIST_HXX
\ No newline at end of file
+#endif // _FG_TOWERLIST_HXX