Tweaks for building with native SGI compilers.

[flightgear.git] / Cockpit / hud.hxx

diff --git a/Cockpit/hud.hxx b/Cockpit/hud.hxx
index cf611cb740edf582712d0c4db5458463660ef438..dfee1928d7cb37d2e17e544152e55c3038d49284 100644 (file)
--- a/Cockpit/hud.hxx
+++ b/Cockpit/hud.hxx
@@ -45,17 +45,15 @@
 #  include <values.h>  // for MAXINT
 #endif
 
+#include <deque>        // STL double ended queue
+
 #include <fg_typedefs.h>
 #include <fg_constants.h>
 #include <Aircraft/aircraft.hxx>
-#include <Flight/flight.hxx>
-#include <Controls/controls.h>
+#include <FDM/flight.hxx>
+#include <Controls/controls.hxx>
 
-#include <deque>        // STL double ended queue
-
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
+FG_USING_STD(deque);
 
 #ifndef WIN32
   typedef struct {
@@ -247,8 +245,11 @@ class instr_item {  // An Abstract Base Class (ABC)
     virtual void draw( void ) = 0;   // Required method in derived classes
 };
 
+typedef deque< instr_item * > HudContainerType;
+typedef HudContainerType::iterator HudIterator;
+
 typedef instr_item *HIptr;
-extern deque< instr_item *> HUD_deque;
+extern HudContainerType HUD_deque;
 
 // instr_item           This class has no other purpose than to maintain
 //                      a linked list of instrument and derived class
@@ -524,6 +525,19 @@ void fgHUDSetTimeMode( Hptr hud, int time_of_day );
 #endif // _HUD_H
 
 // $Log$
+// Revision 1.19  1999/03/02 01:02:38  curt
+// Tweaks for building with native SGI compilers.
+//
+// Revision 1.18  1999/02/26 22:08:45  curt
+// Added initial support for native SGI compilers.
+//
+// Revision 1.17  1999/02/01 21:33:28  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
+// Revision 1.16  1998/10/17 01:33:59  curt
+// C++ ifying ...
+//
 // Revision 1.15  1998/10/16 23:27:27  curt
 // C++-ifying.
 //