Tile loading is interleaved now when not threaded. Threaded loader is

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

diff --git a/src/Scenery/FGTileLoader.hxx b/src/Scenery/FGTileLoader.hxx
index b5fb759c7474655836bc85b7e958e586507f5b38..16878e134c07e24b113c7c84b3f354cca3bddc6d 100644 (file)
--- a/src/Scenery/FGTileLoader.hxx
+++ b/src/Scenery/FGTileLoader.hxx
@@ -30,6 +30,8 @@
 #ifdef ENABLE_THREADS
 #  include <simgear/threads/SGThread.hxx>
 #  include <simgear/threads/SGQueue.hxx>
+#else
+#  include <queue>
 #endif
 
 // Forward reference.
@@ -71,17 +73,21 @@ public:
      * Returns whether the load queue is empty (contains no elements).
      * @return true if load queue is empty otherwise returns false.
      */
-    // bool empty() const { return tile_queue.empty(); }
+    // bool empty() const { return tile_load_queue.empty(); }
 
 private:
 
 private:
 
+#ifdef ENABLE_THREADS
     /**
      * FIFO queue of tiles to load from data files.
      */
-    SGBlockingQueue< FGTileEntry* > tile_queue;
-    
+    SGBlockingQueue< FGTileEntry* > tile_load_queue;
+#else
+    queue< FGTileEntry* > tile_load_queue;
+#endif
+
     /**
      * Base name of directory containing tile data file.
      */