Fix warnings identified by updated XCode.

Mostly unused private vars, for various reasons.

diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index 342cdbe8d6f0727120c2b21bf19422901a791738..76eaa899e4e71f0f498c46332607588c2dd32003 100644 (file)
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -173,7 +173,6 @@ private:
     TrafficVector activeTraffic;
     TrafficVectorIterator currTraffic;
 
-    bool foundRoute;
     double totalDistance, maxDistance;
     FGTowerController *towerController;
     FGAirport *parent;

diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index b1259f7915c164d6cdba64b7ae098f40ce8eadd9..71dddb30bdf9edf5d0be63e8ca5aff90c30dd6fb 100644 (file)
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -234,7 +234,7 @@ FGRouteMgr::~FGRouteMgr()
   input->removeChangeListener(listener);
   delete listener;
     
-  SGCommandMgr* cmdMgr = SGCommandMgr::instance();
+  //SGCommandMgr* cmdMgr = SGCommandMgr::instance();
   //cmdMgr->removeCommand("define-user-waypoint");
     
 }

diff --git a/src/Navaids/markerbeacon.cxx b/src/Navaids/markerbeacon.cxx
index 769eda40a0d6399632539f96b31586104a0708c9..82726e8e1042293411872f536189f17960a7ff51 100644 (file)
--- a/src/Navaids/markerbeacon.cxx
+++ b/src/Navaids/markerbeacon.cxx
@@ -25,6 +25,8 @@
 #endif
 
 #include <Navaids/markerbeacon.hxx>
+#include <Airports/runways.hxx>
+#include <Navaids/NavDataCache.hxx>
 
 using std::string;
 
@@ -34,3 +36,10 @@ FGMarkerBeaconRecord::FGMarkerBeaconRecord(PositionedID aGuid, Type aTy,
   _runway(aRunway)
 {
 }
+
+FGRunwayRef FGMarkerBeaconRecord::runway() const
+{
+    FGPositioned* p = flightgear::NavDataCache::instance()->loadById(_runway);
+    assert(p->type() == FGPositioned::RUNWAY);
+    return static_cast<FGRunway*>(p);
+}
\ No newline at end of file

diff --git a/src/Navaids/markerbeacon.hxx b/src/Navaids/markerbeacon.hxx
index 8ac57dff282e9fb73b8cc147c5752b6ae0c5f7b6..23c88a0de1eaea1007f85d6e8e18af2a9f350ba3 100644 (file)
--- a/src/Navaids/markerbeacon.hxx
+++ b/src/Navaids/markerbeacon.hxx
@@ -27,13 +27,15 @@
 #include <simgear/compiler.h>
 
 #include "positioned.hxx"
-
+#include <Airports/airports_fwd.hxx>
 
 class FGMarkerBeaconRecord : public FGPositioned
 {
 public:
 
   FGMarkerBeaconRecord(PositionedID aGuid, Type aTy, PositionedID aRunway, const SGGeod& aPos);
+    
+    FGRunwayRef runway() const;
 private:
   
   PositionedID _runway;

diff --git a/src/Network/joyclient.hxx b/src/Network/joyclient.hxx
index 818081e1baa0f4a007b23a0964818d6023b53324..47a73667b2ed6f4c779b062163202c4ddf7f7cb9 100644 (file)
--- a/src/Network/joyclient.hxx
+++ b/src/Network/joyclient.hxx
@@ -39,7 +39,6 @@ using std::string;
 class FGJoyClient : public FGProtocol {
 
     char buf[256];
-    int length;
 
 public:
 

diff --git a/src/Network/jsclient.hxx b/src/Network/jsclient.hxx
index a25c623e9fe8e68c8394ac26984f34bce2cbaf09..695d98703625189bf049d426f04996920993256e 100644 (file)
--- a/src/Network/jsclient.hxx
+++ b/src/Network/jsclient.hxx
@@ -40,7 +40,6 @@ using std::string;
 class FGJsClient : public FGProtocol {
 
     char buf[256];
-    int length;
     double axis[4];
     SGPropertyNode_ptr axisdef[4];
     string axisdefstr[4];

diff --git a/src/Network/lfsglass.hxx b/src/Network/lfsglass.hxx
index cb5ff91109b8c66feb036b1e23dc3b60564e72d5..2f102cdefd66555294f801df77ff1c6ade714c10 100644 (file)
--- a/src/Network/lfsglass.hxx
+++ b/src/Network/lfsglass.hxx
@@ -38,7 +38,6 @@
 class FGLFSGlass : public FGProtocol {
 
     FGLFSGlassData buf;
-    int length;
     
     // Environment
     SGPropertyNode_ptr press_node;

diff --git a/src/Network/native.hxx b/src/Network/native.hxx
index 66e00830d2e5bab151a0a75480f9874bc205a871..254ef1391ed101807cd6392ac248b55512153a82 100644 (file)
--- a/src/Network/native.hxx
+++ b/src/Network/native.hxx
@@ -35,7 +35,6 @@
 class FGNative : public FGProtocol {
 
     FGInterface buf;
-    int length;
 
 public:
 

diff --git a/src/Network/native_ctrls.hxx b/src/Network/native_ctrls.hxx
index fe90e79d9509479b545814b58eaddc025cfea6b2..4e4afe57912be493887cada70b7f9af941e733ad 100644 (file)
--- a/src/Network/native_ctrls.hxx
+++ b/src/Network/native_ctrls.hxx
@@ -40,8 +40,6 @@ class FGNativeCtrls : public FGProtocol {
     FGNetCtrls net_ctrls;
     FGControls ctrls;
 
-    int length;
-
 public:
 
     FGNativeCtrls();

diff --git a/src/Network/native_fdm.hxx b/src/Network/native_fdm.hxx
index 4a21864c7c8a355ef11edf5ec86af51f1b4d9e17..3cf5b6e07e6faa98f6f7764be2fa0d697d7130fa 100644 (file)
--- a/src/Network/native_fdm.hxx
+++ b/src/Network/native_fdm.hxx
@@ -36,7 +36,6 @@
 class FGNativeFDM : public FGProtocol {
 
     FGNetFDM buf;
-    int length;
     
 public:
 

diff --git a/src/Network/native_gui.hxx b/src/Network/native_gui.hxx
index 299a40628b67bb7613459fadf134e53953bc65ae..a32b1f740f92f07372917bdb92dae67e0f2b604d 100644 (file)
--- a/src/Network/native_gui.hxx
+++ b/src/Network/native_gui.hxx
@@ -33,7 +33,6 @@
 class FGNativeGUI : public FGProtocol {
 
     FGNetGUI buf;
-    int length;
     
 public: