Fix the nmea and garmin output to a) fake a GSA sentence, b) fix a y2k bug

[flightgear.git] / src / Scenery / FGTileLoader.hxx

diff --git a/src/Scenery/FGTileLoader.hxx b/src/Scenery/FGTileLoader.hxx
index 91ecb82df74b4913d4d97664399491665f5e5bbd..74e465f84b3c6dd0525d827ac9c6110b04868365 100644 (file)
--- a/src/Scenery/FGTileLoader.hxx
+++ b/src/Scenery/FGTileLoader.hxx
@@ -32,8 +32,10 @@
 #  include <simgear/threads/SGQueue.hxx>
 #else
 #  include <queue>
+   SG_USING_STD( queue );
 #endif
 
+
 // Forward reference.
 class FGTileEntry;
 
@@ -54,12 +56,14 @@ public:
      */
     ~FGTileLoader();
 
+#if 0 // we don't ever want to do this I don't think
     /**
      * Flush anything in pending load queue without doing the work
      * Leave the free queue intact since that's are only record of
      * things we need to remove.
      */
     void reinit();
+#endif
     
     /**
      * Add a tile to the end of the load queue.
@@ -107,7 +111,7 @@ private:
     /**
      * Base name of directory containing tile data file.
      */
-    SGPath tile_path;
+    string tile_path;
 
 #ifdef ENABLE_THREADS
     /**
@@ -151,7 +155,7 @@ private:
      * Lock and synchronize access to tile queue.
      */
     SGMutex mutex;
-    SGCondition frame_cond;
+    SGPthreadCond frame_cond;
 
     /**
      * Thread cleanup handler.