From 53be443264a07954bbe2e46ca6009e7d3bd9f468 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 2 Mar 1999 01:02:31 +0000
Subject: [PATCH] Tweaks for building with native SGI compilers.

---
 Airports/genapt.cxx  |  6 +++++-
 Airports/genapt.hxx  | 15 +++++++++------
 Airports/simple.hxx  |  6 +++++-
 Cockpit/hud.cxx      |  6 +++---
 Cockpit/hud.hxx      | 14 ++++++++++----
 Main/fg_init.cxx     |  6 +++---
 Main/fg_serial.cxx   |  6 +++++-
 Main/options.cxx     | 11 ++++++++++-
 Main/options.hxx     |  7 +++----
 Objects/fragment.hxx |  7 +++----
 Objects/material.cxx |  7 +++----
 Objects/obj.cxx      |  7 ++++---
 Scenery/tile.cxx     | 11 ++++++++---
 Scenery/tile.hxx     |  4 +++-
 Time/event.hxx       |  6 +++---
 15 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/Airports/genapt.cxx b/Airports/genapt.cxx
index e1f26bb7f..b84009974 100644
--- a/Airports/genapt.cxx
+++ b/Airports/genapt.cxx
@@ -50,7 +50,8 @@
 
 #include "genapt.hxx"
 
-FG_USING_NAMESPACE(std);
+FG_USING_STD(string);
+FG_USING_STD(vector);
 
 
 typedef vector < Point3D > container;
@@ -293,6 +294,9 @@ fgAptGenerate(const string& path, fgTILE *tile)
 
 
 // $Log$
+// Revision 1.14  1999/03/02 01:02:31  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.13  1999/02/26 22:08:34  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Airports/genapt.hxx b/Airports/genapt.hxx
index 964722f94..fa5c0dccf 100644
--- a/Airports/genapt.hxx
+++ b/Airports/genapt.hxx
@@ -32,13 +32,10 @@
 #endif                                   
 
 
-#include <string>        // Standard C++ string library
-#include <set>
-#include "Include/fg_stl_config.h"
+#include <Include/compiler.h>
 
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
+#include STL_STRING
+#include <set>
 
 #ifdef __BORLANDC__
 #  define exception c_exception
@@ -46,6 +43,9 @@ using namespace std;
 
 #include <Scenery/tile.hxx>
 
+FG_USING_STD(string);
+FG_USING_STD(set);
+
 
 // maximum size of airport perimeter structure, even for complex
 // airports such as KORD this number is typically not very big.
@@ -65,6 +65,9 @@ fgAptGenerate(const string& path, fgTILE *tile);
 
 
 // $Log$
+// Revision 1.3  1999/03/02 01:02:32  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.2  1998/11/23 21:48:10  curt
 // Borland portability tweaks.
 //
diff --git a/Airports/simple.hxx b/Airports/simple.hxx
index eae237ad2..221b61097 100644
--- a/Airports/simple.hxx
+++ b/Airports/simple.hxx
@@ -39,7 +39,8 @@
 #include STL_STRING
 #include <set>
 
-FG_USING_NAMESPACE(std);
+FG_USING_STD(string);
+FG_USING_STD(set);
 
 
 class fgAIRPORT {
@@ -104,6 +105,9 @@ public:
 
 
 // $Log$
+// Revision 1.7  1999/03/02 01:02:33  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.6  1999/02/26 22:08:36  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Cockpit/hud.cxx b/Cockpit/hud.cxx
index 6c242f387..eb59d8c24 100644
--- a/Cockpit/hud.cxx
+++ b/Cockpit/hud.cxx
@@ -65,9 +65,6 @@ static char units[5];
 // They should eventually be member functions of the aircraft.
 //
 
-typedef deque< instr_item * > HudContainerType;
-typedef HudContainerType::iterator HudIterator;
-
 HudContainerType HUD_deque;
 
 class locRECT {
@@ -838,6 +835,9 @@ void fgUpdateHUD( void ) {
 }
 
 // $Log$
+// Revision 1.32  1999/03/02 01:02:37  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.31  1999/02/02 20:13:31  curt
 // MSVC++ portability changes by Bernie Bright:
 //
diff --git a/Cockpit/hud.hxx b/Cockpit/hud.hxx
index 6992c3556..dfee1928d 100644
--- a/Cockpit/hud.hxx
+++ b/Cockpit/hud.hxx
@@ -45,15 +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 <FDM/flight.hxx>
 #include <Controls/controls.hxx>
 
-#include <deque>        // STL double ended queue
-
-FG_USING_NAMESPACE(std);
+FG_USING_STD(deque);
 
 #ifndef WIN32
   typedef struct {
@@ -245,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
@@ -522,6 +525,9 @@ 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.
 //
diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index db93c6c09..a731711f6 100644
--- a/Main/fg_init.cxx
+++ b/Main/fg_init.cxx
@@ -70,9 +70,6 @@
 #include "fg_serial.hxx"
 
 FG_USING_STD(string);
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_NAMESPACE(std);
-#endif
 
 extern const char *default_root;
 
@@ -398,6 +395,9 @@ int fgInitSubsystems( void )
 
 
 // $Log$
+// Revision 1.68  1999/03/02 01:03:15  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.67  1999/02/26 22:09:48  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Main/fg_serial.cxx b/Main/fg_serial.cxx
index d146b5b8e..d0853074c 100644
--- a/Main/fg_serial.cxx
+++ b/Main/fg_serial.cxx
@@ -44,7 +44,8 @@
 
 #include "fg_serial.hxx"
 
-FG_USING_NAMESPACE(std);
+FG_USING_STD(string);
+FG_USING_STD(vector);
 
 // support an arbitrary number of serial channels.  Each channel can
 // be assigned to an arbitrary port.  Bi-directional communication is
@@ -466,6 +467,9 @@ void fgSerialProcess() {
 
 
 // $Log$
+// Revision 1.13  1999/03/02 01:03:16  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.12  1999/02/26 22:09:50  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Main/options.cxx b/Main/options.cxx
index 6706cca83..b4e0e7aff 100644
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -26,11 +26,14 @@
 #  include <config.h>
 #endif
 
+#include <Include/compiler.h>
+
 #include <math.h>            // rint()
 #include <stdio.h>
 #include <stdlib.h>          // atof(), atoi()
 #include <string.h>
-#include <string>
+
+#include STL_STRING
 
 #include <Debug/logstream.hxx>
 #include <Misc/fgstream.hxx>
@@ -40,6 +43,9 @@
 
 #include "fg_serial.hxx"
 
+FG_USING_STD(string);
+FG_USING_NAMESPACE(std);
+
 
 inline double
 atof( const string& str )
@@ -631,6 +637,9 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.41  1999/03/02 01:03:17  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.40  1999/02/26 22:09:51  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Main/options.hxx b/Main/options.hxx
index 1a9d28e7d..4830d2dfe 100644
--- a/Main/options.hxx
+++ b/Main/options.hxx
@@ -49,10 +49,6 @@
 FG_USING_STD(vector);
 FG_USING_STD(string);
 
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_NAMESPACE(std);
-#endif
-
 typedef vector < string > str_container;
 typedef str_container::iterator str_iterator;
 typedef str_container::const_iterator const_str_iterator;
@@ -245,6 +241,9 @@ extern fgOPTIONS current_options;
 
 
 // $Log$
+// Revision 1.29  1999/03/02 01:03:19  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.28  1999/02/26 22:09:52  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Objects/fragment.hxx b/Objects/fragment.hxx
index a0f2cce1f..384c25dc4 100644
--- a/Objects/fragment.hxx
+++ b/Objects/fragment.hxx
@@ -52,10 +52,6 @@
 
 FG_USING_STD(vector);
 
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_NAMESPACE(std);
-#endif
-
 // Maximum nodes per tile
 #define MAX_NODES 2000
 
@@ -182,6 +178,9 @@ operator == ( const fgFRAGMENT & lhs, const fgFRAGMENT & rhs ) {
 
 
 // $Log$
+// Revision 1.9  1999/03/02 01:03:23  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.8  1999/02/26 22:09:57  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Objects/material.cxx b/Objects/material.cxx
index f19499a1e..6500edc85 100644
--- a/Objects/material.cxx
+++ b/Objects/material.cxx
@@ -49,10 +49,6 @@
 #include "texload.h"
 
 FG_USING_STD(string);
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_NAMESPACE(std);
-#endif
-
 
 
 // global material management class
@@ -368,6 +364,9 @@ fgMATERIAL_MGR::render_fragments()
 
 
 // $Log$
+// Revision 1.14  1999/03/02 01:03:24  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.13  1999/02/26 22:09:58  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Objects/obj.cxx b/Objects/obj.cxx
index eb38398b9..84787bce6 100644
--- a/Objects/obj.cxx
+++ b/Objects/obj.cxx
@@ -61,9 +61,7 @@
 #include "obj.hxx"
 
 FG_USING_STD(string);
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_NAMESPACE(std);
-#endif
+
 
 static double normals[MAX_NODES][3];
 
@@ -556,6 +554,9 @@ int fgObjLoad( const string& path, fgTILE *t) {
 
 
 // $Log$
+// Revision 1.12  1999/03/02 01:03:25  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.11  1999/02/26 22:09:59  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Scenery/tile.cxx b/Scenery/tile.cxx
index 14edd51e3..1443c6113 100644
--- a/Scenery/tile.cxx
+++ b/Scenery/tile.cxx
@@ -22,11 +22,10 @@
 // (Log is kept at end of this file)
 
 
-#include "Include/compiler.h"
+#include <Include/compiler.h>
+
 #include STL_FUNCTIONAL
 #include STL_ALGORITHM
-FG_USING_STD(for_each);
-FG_USING_STD(mem_fun_ref);
 
 #include <Debug/logstream.hxx>
 #include <Scenery/tile.hxx>
@@ -34,6 +33,9 @@ FG_USING_STD(mem_fun_ref);
 
 #include "tile.hxx"
 
+FG_USING_STD(for_each);
+FG_USING_STD(mem_fun_ref);
+
 
 // Constructor
 fgTILE::fgTILE ( void )
@@ -65,6 +67,9 @@ fgTILE::release_fragments()
 
 
 // $Log$
+// Revision 1.15  1999/03/02 01:03:29  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.14  1999/02/02 20:13:40  curt
 // MSVC++ portability changes by Bernie Bright:
 //
diff --git a/Scenery/tile.hxx b/Scenery/tile.hxx
index 14ea62861..46240a910 100644
--- a/Scenery/tile.hxx
+++ b/Scenery/tile.hxx
@@ -56,7 +56,6 @@ FG_USING_STD(vector);
 
 #ifdef FG_HAVE_NATIVE_SGI_COMPILERS
 #include <strings.h>
-FG_USING_NAMESPACE(std);
 #endif
 
 // Scenery tile class
@@ -162,6 +161,9 @@ private:
 
 
 // $Log$
+// Revision 1.25  1999/03/02 01:03:30  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.24  1999/02/26 22:10:02  curt
 // Added initial support for native SGI compilers.
 //
diff --git a/Time/event.hxx b/Time/event.hxx
index d9e810210..69ad7217e 100644
--- a/Time/event.hxx
+++ b/Time/event.hxx
@@ -45,9 +45,6 @@ FG_USING_STD(deque);
 FG_USING_STD(list);
 FG_USING_STD(string);
 
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_NAMESPACE(std);
-#endif
 
 class fgEVENT
 {
@@ -169,6 +166,9 @@ extern fgEVENT_MGR global_events;
 
 
 // $Log$
+// Revision 1.18  1999/03/02 01:03:33  curt
+// Tweaks for building with native SGI compilers.
+//
 // Revision 1.17  1999/02/26 22:10:08  curt
 // Added initial support for native SGI compilers.
 //
-- 
2.39.2