Tweaks for building with native SGI compilers.

diff --git a/Airports/genapt.cxx b/Airports/genapt.cxx
index e1f26bb7f0b219fdd177255e215850d926782e2c..b8400997466ae7e4a529e7d8bd085aef26980210 100644 (file)
--- 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 964722f943af3ff1730b415287845a61feeed42e..fa5c0dccfeab6bf51511532ce36ad184965711b3 100644 (file)
--- 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 eae237ad2caa79d386c3d7ad79c4d4292e73123a..221b6109781e47377532f9b8bf9f35a4795c86b0 100644 (file)
--- 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 6c242f3876be11e9d430236236dd03f4ed044166..eb59d8c24f5052294ea0c8f4eef65723e993ef5a 100644 (file)
--- 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 6992c3556fafb2455b0a1e15402bc4becf000984..dfee1928d7cb37d2e17e544152e55c3038d49284 100644 (file)
--- 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 db93c6c098b5f5e28133bd95e59b25b361c668ef..a731711f6b2423bb992f4aa6b710faa3f4977a7b 100644 (file)
--- 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 d146b5b8ece5b9172adc9804c2d1e96aba2c097c..d0853074cae75054108c405861f653e688837d7f 100644 (file)
--- 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 6706cca8326ffa49e15d2b619a861d201d1fa802..b4e0e7aff713d73ddf0c240b91a9d491e1aed6cc 100644 (file)
--- 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 1a9d28e7da090c25f9134067054d09df166ea4c6..4830d2dfea22dbae041ccb906973bfe07a1040a6 100644 (file)
--- 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 a0f2cce1f43b0b63d0da845830e334d23931f300..384c25dc454fa4a69f50fa91603ef9bbcfc97205 100644 (file)
--- 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 f19499a1e9a53e4df442683632170bcf2ad49236..6500edc8547cbacf649cda57eb100dee4cc1f3a9 100644 (file)
--- 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 eb38398b940c99cbc19e6122e265fbc27e6fa0f5..84787bce6bb9f76e92ea020934e4a69fdd3f38a7 100644 (file)
--- 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 14edd51e3a36d63f245462ee9c2401245088cd55..1443c61134f0e34c2254156d6c96d3fbf5a4758d 100644 (file)
--- 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 14ea62861a4f5ab2c0071018224c12c7f30f6f6d..46240a9106232222a017481079d46075c58ada39 100644 (file)
--- 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 d9e810210ef54d7990f450553d33febf5215ca62..69ad7217e1415f74973add3e060664c44bdc35f7 100644 (file)
--- 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.
 //