From 00ccbd1f25551980a3def8d78540e6804c7bf983 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 26 Feb 1999 22:08:34 +0000
Subject: [PATCH] Added initial support for native SGI compilers.

---
 Airports/genapt.cxx   | 22 ++++++++++++++--------
 Airports/simple.cxx   | 15 +++++++++------
 Airports/simple.hxx   | 14 ++++++++------
 Astro/moon.cxx        |  8 ++++----
 Cockpit/hud.hxx       |  7 ++++---
 Cockpit/panel.cxx     |  7 +++++--
 Cockpit/panel.hxx     |  5 ++++-
 Main/GLUTkey.cxx      |  5 ++++-
 Main/GLUTmain.cxx     |  5 ++++-
 Main/fg_init.cxx      | 13 +++++++++++--
 Main/fg_serial.cxx    |  9 +++++----
 Main/options.cxx      |  5 ++++-
 Main/options.hxx      | 11 +++++++----
 Objects/fragment.cxx  |  4 +++-
 Objects/fragment.hxx  | 14 ++++++++++----
 Objects/material.cxx  | 16 +++++++++++++---
 Objects/obj.cxx       | 26 +++++++++++++++-----------
 Scenery/tile.hxx      | 18 +++++++++++++-----
 Scenery/tilecache.cxx |  5 ++++-
 Scenery/tilemgr.cxx   |  5 ++++-
 Time/event.hxx        | 18 ++++++++++++------
 Time/fg_time.cxx      |  7 +++++--
 Time/sunpos.cxx       | 10 ++++++----
 23 files changed, 168 insertions(+), 81 deletions(-)

diff --git a/Airports/genapt.cxx b/Airports/genapt.cxx
index 22ad16736..e1f26bb7f 100644
--- a/Airports/genapt.cxx
+++ b/Airports/genapt.cxx
@@ -23,19 +23,20 @@
 // (Log is kept at end of this file)
 
 
-#include <string>        // Standard C++ string library
-#include <vector>
-#include "Include/fg_stl_config.h"
+#include <Include/compiler.h>
 
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
+#include STL_STRING
+#include <vector>
 
 #ifdef __BORLANDC__
 #  define exception c_exception
 #endif
 #include <math.h>
 
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#  include <strings.h>
+#endif
+
 #include <Debug/logstream.hxx>
 // #include <Include/fg_types.h>
 #include <Math/fg_geodesy.hxx>
@@ -49,6 +50,8 @@ using namespace std;
 
 #include "genapt.hxx"
 
+FG_USING_NAMESPACE(std);
+
 
 typedef vector < Point3D > container;
 typedef container::iterator iterator;
@@ -235,7 +238,7 @@ fgAptGenerate(const string& path, fgTILE *tile)
 	if ( token == "a" ) {
 	    // airport info record (start of airport)
 
-	    if ( apt_id != "" ) {
+	    if ( apt_id.length() > 0 ) {
 		// we have just finished reading and airport record.
 		// process the info
 		gen_base(average, perimeter, tile);
@@ -274,7 +277,7 @@ fgAptGenerate(const string& path, fgTILE *tile)
 	in >> skipcomment;
     }
 
-    if ( apt_id != "" ) {
+    if ( apt_id.length() > 0 ) {
 	// we have just finished reading and airport record.
 	// process the info
 	size = perimeter.size();
@@ -290,6 +293,9 @@ fgAptGenerate(const string& path, fgTILE *tile)
 
 
 // $Log$
+// Revision 1.13  1999/02/26 22:08:34  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.12  1999/02/01 21:08:33  curt
 // Optimizations from Norman Vine.
 //
diff --git a/Airports/simple.cxx b/Airports/simple.cxx
index bbe93f4c5..eddc1c4ec 100644
--- a/Airports/simple.cxx
+++ b/Airports/simple.cxx
@@ -1,5 +1,5 @@
 //
-// airports.cxx -- a really simplistic class to manage airport ID,
+// simple.cxx -- a really simplistic class to manage airport ID,
 //                 lat, lon of the center of one of it's runways, and 
 //                 elevation in feet.
 //
@@ -25,18 +25,18 @@
 // (Log is kept at end of this file)
 
 
-#include <string>
+#include <Include/compiler.h>
 
 #include <Debug/logstream.hxx>
-#include <Main/options.hxx>
 #include <Misc/fgstream.hxx>
+#include <Main/options.hxx>
 
-#include "simple.hxx"
-
-#include "Include/fg_stl_config.h"
+#include STL_STRING
 #include STL_FUNCTIONAL
 #include STL_ALGORITHM
 
+#include "simple.hxx"
+
 
 fgAIRPORTS::fgAIRPORTS() {
 }
@@ -110,6 +110,9 @@ fgAIRPORTS::~fgAIRPORTS( void ) {
 
 
 // $Log$
+// Revision 1.10  1999/02/26 22:08:35  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.9  1998/11/06 21:17:34  curt
 // Converted to new logstream debugging facility.  This allows release
 // builds with no messages at all (and no performance impact) by using
diff --git a/Airports/simple.hxx b/Airports/simple.hxx
index 96faba2c2..eae237ad2 100644
--- a/Airports/simple.hxx
+++ b/Airports/simple.hxx
@@ -1,5 +1,5 @@
 //
-// airports.hxx -- a really simplistic class to manage airport ID,
+// simple.hxx -- a really simplistic class to manage airport ID,
 //                 lat, lon of the center of one of it's runways, and 
 //                 elevation in feet.
 //
@@ -34,13 +34,12 @@
 #endif                                   
 
 
-#include <string>        // Standard C++ string library
+#include <Include/compiler.h>
+
+#include STL_STRING
 #include <set>
-#include "Include/fg_stl_config.h"
 
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
+FG_USING_NAMESPACE(std);
 
 
 class fgAIRPORT {
@@ -105,6 +104,9 @@ public:
 
 
 // $Log$
+// Revision 1.6  1999/02/26 22:08:36  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.5  1998/11/02 18:25:34  curt
 // Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
 // Other misc. tweaks.
diff --git a/Astro/moon.cxx b/Astro/moon.cxx
index 1c358dcf6..9b0883ff2 100644
--- a/Astro/moon.cxx
+++ b/Astro/moon.cxx
@@ -23,19 +23,19 @@
  * (Log is kept at end of this file)
  **************************************************************************/
 
-#include <FDM/flight.hxx>
-
 #include <string.h>
-#include "moon.hxx"
+
 #include <Debug/logstream.hxx>
 #include <Objects/texload.h>
-
+#include <FDM/flight.hxx>
 
 #ifdef __BORLANDC__
 #  define exception c_exception
 #endif
 #include <math.h>
 
+#include "moon.hxx"
+
 static GLuint moon_texid;
 static GLubyte *moon_texbuf;
 
diff --git a/Cockpit/hud.hxx b/Cockpit/hud.hxx
index f25358c4d..6992c3556 100644
--- a/Cockpit/hud.hxx
+++ b/Cockpit/hud.hxx
@@ -53,9 +53,7 @@
 
 #include <deque>        // STL double ended queue
 
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
+FG_USING_NAMESPACE(std);
 
 #ifndef WIN32
   typedef struct {
@@ -524,6 +522,9 @@ void fgHUDSetTimeMode( Hptr hud, int time_of_day );
 #endif // _HUD_H
 
 // $Log$
+// 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.
diff --git a/Cockpit/panel.cxx b/Cockpit/panel.cxx
index 0456f1e2e..c4ad13451 100644
--- a/Cockpit/panel.cxx
+++ b/Cockpit/panel.cxx
@@ -557,7 +557,7 @@ void fgPanelUpdate ( void ) {
     var[0] = get_speed() * 1.4; // We have to multiply the airspeed by a 
                                 // factor, to simulate flying a Bonanza 
     var[1] = get_altitude();
-    var[2] = get_climb_rate(); 
+    var[2] = get_climb_rate() / 1000.0; 
     var[3] = get_throttleval();
     // v = &current_view;
     xglMatrixMode(GL_PROJECTION);
@@ -580,7 +580,7 @@ void fgPanelUpdate ( void ) {
     xglLoadIdentity();
     xglTranslatef(pointer[i].XPos, pointer[i].YPos, 0.0);
     xglRotatef(-pointer[i].tape[0], 0.0, 0.0, 1.0);
-    fgEraseArea(pointer[i].vertices, 20, (GLfloat)(pointer[i].teXpos),                          (GLfloat)(pointer[i].texYpos), (GLfloat)(pointer[i].XPos),                      (GLfloat)(pointer[i].YPos), 0);
+    fgEraseArea(pointer[i].vertices, 20, (GLfloat)(pointer[i].teXpos),                          (GLfloat)(pointer[i].texYpos), (GLfloat)(pointer[i].XPos),                      (GLfloat)(pointer[i].YPos), 0, 1);
     xglLoadIdentity();
     }
 
@@ -1112,6 +1112,9 @@ printf("         %f %f %f %f \n", mvmatrix[12], mvmatrix[13], mvmatrix[14], mvma
 }
 
 // $Log$
+// Revision 1.16  1999/02/26 22:08:46  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.15  1999/02/12 01:46:29  curt
 // Updates and fixes from Friedemann.
 //
diff --git a/Cockpit/panel.hxx b/Cockpit/panel.hxx
index 91e785aca..1d1baa6b6 100644
--- a/Cockpit/panel.hxx
+++ b/Cockpit/panel.hxx
@@ -106,7 +106,7 @@ void CreatePointer(Pointer *pointer);
 void UpdatePointer(Pointer *pointer);
 void fgEraseArea(GLfloat *array, int NumVerti, GLfloat texXPos,
 		 GLfloat texYPos, GLfloat XPos, GLfloat YPos,
-		 int Texid, float ScaleFactor = 1);
+		 int Texid, float ScaleFactor);
 void fgUpdateTurnCoordinator(TurnCoordinator *turn); 
 void fgInitTurnCoordinator(TurnCoordinator *turn);
 void DrawScale(float XPos, float YPos, float InnerRadius, float OuterRadius,
@@ -120,6 +120,9 @@ void PrintMatrix( void);
 
 
 // $Log$
+// Revision 1.7  1999/02/26 22:08:47  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.6  1999/02/12 01:46:30  curt
 // Updates and fixes from Friedemann.
 //
diff --git a/Main/GLUTkey.cxx b/Main/GLUTkey.cxx
index e04a1db54..ab092198d 100644
--- a/Main/GLUTkey.cxx
+++ b/Main/GLUTkey.cxx
@@ -35,12 +35,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <Debug/logstream.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Astro/solarsystem.hxx>
 #include <Astro/sky.hxx>
 #include <Autopilot/autopilot.hxx>
 #include <Cockpit/hud.hxx>
-#include <Debug/logstream.hxx>
 #include <GUI/gui.h>
 #include <Include/fg_constants.h>
 #include <Objects/material.hxx>
@@ -434,6 +434,9 @@ void GLUTspecialkey(int k, int x, int y) {
 
 
 // $Log$
+// Revision 1.42  1999/02/26 22:09:46  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.41  1999/02/12 23:22:43  curt
 // Allow auto-throttle adjustment while active.
 //
diff --git a/Main/GLUTmain.cxx b/Main/GLUTmain.cxx
index d8d24ac9b..bfa7c4a7c 100644
--- a/Main/GLUTmain.cxx
+++ b/Main/GLUTmain.cxx
@@ -53,6 +53,7 @@
 #include <Include/fg_constants.h>  // for VERSION
 #include <Include/general.hxx>
 
+#include <Debug/logstream.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Astro/sky.hxx>
 #include <Astro/stars.hxx>
@@ -65,7 +66,6 @@
 
 #include <Autopilot/autopilot.hxx>
 #include <Cockpit/cockpit.hxx>
-#include <Debug/logstream.hxx>
 #include <GUI/gui.h>
 #include <Joystick/joystick.hxx>
 #include <Math/fg_geodesy.hxx>
@@ -1007,6 +1007,9 @@ int main( int argc, char **argv ) {
 
 
 // $Log$
+// Revision 1.86  1999/02/26 22:09:47  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.85  1999/02/05 21:29:08  curt
 // Modifications to incorporate Jon S. Berndts flight model code.
 //
diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index 012db04f7..db93c6c09 100644
--- a/Main/fg_init.cxx
+++ b/Main/fg_init.cxx
@@ -37,10 +37,13 @@
 #  define _G_NO_EXTERN_TEMPLATES
 #endif
 
-#include <string>
+#include <Include/compiler.h>
+
+#include STL_STRING
 
 #include <Include/fg_constants.h>
 
+#include <Debug/logstream.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Airports/simple.hxx>
 #include <Astro/sky.hxx>
@@ -48,7 +51,6 @@
 #include <Astro/solarsystem.hxx>
 #include <Autopilot/autopilot.hxx>
 #include <Cockpit/cockpit.hxx>
-#include <Debug/logstream.hxx>
 #include <Joystick/joystick.hxx>
 #include <Math/fg_geodesy.hxx>
 #include <Math/fg_random.h>
@@ -67,6 +69,10 @@
 #include "views.hxx"
 #include "fg_serial.hxx"
 
+FG_USING_STD(string);
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+FG_USING_NAMESPACE(std);
+#endif
 
 extern const char *default_root;
 
@@ -392,6 +398,9 @@ int fgInitSubsystems( void )
 
 
 // $Log$
+// Revision 1.67  1999/02/26 22:09:48  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.66  1999/02/05 21:29:10  curt
 // Modifications to incorporate Jon S. Berndts flight model code.
 //
diff --git a/Main/fg_serial.cxx b/Main/fg_serial.cxx
index 86f1586e8..d146b5b8e 100644
--- a/Main/fg_serial.cxx
+++ b/Main/fg_serial.cxx
@@ -33,12 +33,9 @@
 #include STL_STRING
 #include STL_IOSTREAM                                           
 #include <vector>                                                               
-#include "Include/fg_stl_config.h"                                              
 
-FG_USING_NAMESPACE(std);
-
-#include <Aircraft/aircraft.hxx>
 #include <Debug/logstream.hxx>
+#include <Aircraft/aircraft.hxx>
 #include <Include/fg_constants.h>
 #include <Serial/serial.hxx>
 #include <Time/fg_time.hxx>
@@ -47,6 +44,7 @@ FG_USING_NAMESPACE(std);
 
 #include "fg_serial.hxx"
 
+FG_USING_NAMESPACE(std);
 
 // support an arbitrary number of serial channels.  Each channel can
 // be assigned to an arbitrary port.  Bi-directional communication is
@@ -468,6 +466,9 @@ void fgSerialProcess() {
 
 
 // $Log$
+// Revision 1.12  1999/02/26 22:09:50  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.11  1999/02/05 21:29:11  curt
 // Modifications to incorporate Jon S. Berndts flight model code.
 //
diff --git a/Main/options.cxx b/Main/options.cxx
index e63c13a95..6706cca83 100644
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -33,10 +33,10 @@
 #include <string>
 
 #include <Debug/logstream.hxx>
+#include <Misc/fgstream.hxx>
 #include <FDM/flight.hxx>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
-#include <Misc/fgstream.hxx>
 
 #include "fg_serial.hxx"
 
@@ -631,6 +631,9 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.40  1999/02/26 22:09:51  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.39  1999/02/05 21:29:12  curt
 // Modifications to incorporate Jon S. Berndts flight model code.
 //
diff --git a/Main/options.hxx b/Main/options.hxx
index 3c6a3849d..1a9d28e7d 100644
--- a/Main/options.hxx
+++ b/Main/options.hxx
@@ -44,14 +44,14 @@
 #include <XGL/xgl.h>
 
 #include STL_STRING
-FG_USING_STD(string);
-
 #include <vector>
-#include "Include/compiler.h"
+
 FG_USING_STD(vector);
 FG_USING_STD(string);
-// #include "fg_serial.hxx"
 
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+FG_USING_NAMESPACE(std);
+#endif
 
 typedef vector < string > str_container;
 typedef str_container::iterator str_iterator;
@@ -245,6 +245,9 @@ extern fgOPTIONS current_options;
 
 
 // $Log$
+// Revision 1.28  1999/02/26 22:09:52  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.27  1999/02/05 21:29:13  curt
 // Modifications to incorporate Jon S. Berndts flight model code.
 //
diff --git a/Objects/fragment.cxx b/Objects/fragment.cxx
index 2466dfd76..9af71d78f 100644
--- a/Objects/fragment.cxx
+++ b/Objects/fragment.cxx
@@ -23,7 +23,6 @@
 
 
 #include <Include/fg_constants.h>
-// #include <Include/fg_types.h>
 #include <Math/mat3.h>
 #include <Math/point3d.hxx>
 #include <Scenery/tile.hxx>
@@ -324,6 +323,9 @@ int fgFRAGMENT::intersect( const Point3D& end0,
 }
 
 // $Log$
+// Revision 1.7  1999/02/26 22:09:56  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.6  1998/10/18 01:17:20  curt
 // Point3D tweaks.
 //
diff --git a/Objects/fragment.hxx b/Objects/fragment.hxx
index 70f15ad8e..a0f2cce1f 100644
--- a/Objects/fragment.hxx
+++ b/Objects/fragment.hxx
@@ -41,18 +41,21 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#include <Include/compiler.h>
+
 #include <vector>
 
 #include <Bucket/bucketutils.h>
-// #include <Include/fg_types.h>
-#include "Include/fg_constants.h"
+#include <Include/fg_constants.h>
 #include <Math/mat3.h>
 #include <Math/point3d.hxx>
 
-#include <Include/compiler.h>
-//FG_USING_NAMESPACE(std);
 FG_USING_STD(vector);
 
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+FG_USING_NAMESPACE(std);
+#endif
+
 // Maximum nodes per tile
 #define MAX_NODES 2000
 
@@ -179,6 +182,9 @@ operator == ( const fgFRAGMENT & lhs, const fgFRAGMENT & rhs ) {
 
 
 // $Log$
+// Revision 1.8  1999/02/26 22:09:57  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.7  1998/11/02 18:29:00  curt
 // Portability changes for the Borland compiler.
 //
diff --git a/Objects/material.cxx b/Objects/material.cxx
index f5e505236..f19499a1e 100644
--- a/Objects/material.cxx
+++ b/Objects/material.cxx
@@ -33,13 +33,14 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#include <Include/compiler.h>
+
 #include <string.h>
-#include <string>
+#include STL_STRING
 
-#include "Include/fg_stl_config.h"
 #include <Debug/logstream.hxx>
-#include <Main/options.hxx>
 #include <Misc/fgstream.hxx>
+#include <Main/options.hxx>
 #include <Main/views.hxx>
 #include <Scenery/tile.hxx>
 
@@ -47,6 +48,12 @@
 #include "fragment.hxx"
 #include "texload.h"
 
+FG_USING_STD(string);
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+FG_USING_NAMESPACE(std);
+#endif
+
+
 
 // global material management class
 fgMATERIAL_MGR material_mgr;
@@ -361,6 +368,9 @@ fgMATERIAL_MGR::render_fragments()
 
 
 // $Log$
+// Revision 1.13  1999/02/26 22:09:58  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.12  1998/12/09 18:50:30  curt
 // Converted "class fgVIEW" to "class FGView" and updated to make data
 // members private and make required accessor functions.
diff --git a/Objects/obj.cxx b/Objects/obj.cxx
index 64a79b1ef..eb38398b9 100644
--- a/Objects/obj.cxx
+++ b/Objects/obj.cxx
@@ -35,34 +35,35 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#if defined ( __sun__ )
-extern "C" void *memmove(void *, const void *, size_t);
-extern "C" void *memset(void *, int, size_t);
-#endif
+// #if defined ( __sun__ )
+// extern "C" void *memmove(void *, const void *, size_t);
+// extern "C" void *memset(void *, int, size_t);
+// #endif
+
+#include <Include/compiler.h>
 
-#include <string>       // Standard C++ library
+#include STL_STRING
 #include <map>          // STL
 #include <ctype.h>      // isdigit()
 
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
-
 #include <Debug/logstream.hxx>
+#include <Misc/fgstream.hxx>
 #include <Include/fg_constants.h>
-#include <Include/fg_zlib.h>
 #include <Main/options.hxx>
 #include <Math/mat3.h>
 #include <Math/fg_random.h>
 #include <Math/point3d.hxx>
 #include <Math/polar3d.hxx>
 #include <Misc/stopwatch.hxx>
-#include <Misc/fgstream.hxx>
 #include <Scenery/tile.hxx>
 
 #include "material.hxx"
 #include "obj.hxx"
 
+FG_USING_STD(string);
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+FG_USING_NAMESPACE(std);
+#endif
 
 static double normals[MAX_NODES][3];
 
@@ -555,6 +556,9 @@ int fgObjLoad( const string& path, fgTILE *t) {
 
 
 // $Log$
+// Revision 1.11  1999/02/26 22:09:59  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.10  1998/11/06 21:18:18  curt
 // Converted to new logstream debugging facility.  This allows release
 // builds with no messages at all (and no performance impact) by using
diff --git a/Scenery/tile.hxx b/Scenery/tile.hxx
index 32d749b7a..14ea62861 100644
--- a/Scenery/tile.hxx
+++ b/Scenery/tile.hxx
@@ -41,18 +41,23 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <vector>
-#include <string>
+#include <Include/compiler.h>
 
-#include "Include/compiler.h"
-FG_USING_STD(string);
-FG_USING_STD(vector);
+#include <vector>
+#include STL_STRING
 
 #include <Bucket/bucketutils.h>
 #include <Math/mat3.h>
 #include <Math/point3d.hxx>
 #include <Objects/fragment.hxx>
 
+FG_USING_STD(string);
+FG_USING_STD(vector);
+
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#include <strings.h>
+FG_USING_NAMESPACE(std);
+#endif
 
 // Scenery tile class
 class fgTILE {
@@ -157,6 +162,9 @@ private:
 
 
 // $Log$
+// Revision 1.24  1999/02/26 22:10:02  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.23  1999/02/02 20:13:41  curt
 // MSVC++ portability changes by Bernie Bright:
 //
diff --git a/Scenery/tilecache.cxx b/Scenery/tilecache.cxx
index 83cdd74ed..21f93f7be 100644
--- a/Scenery/tilecache.cxx
+++ b/Scenery/tilecache.cxx
@@ -33,9 +33,9 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#include <Debug/logstream.hxx>
 #include <Airports/genapt.hxx>
 #include <Bucket/bucketutils.hxx>
-#include <Debug/logstream.hxx>
 #include <Main/options.hxx>
 #include <Main/views.hxx>
 #include <Objects/obj.hxx>
@@ -181,6 +181,9 @@ fgTILECACHE::~fgTILECACHE( void ) {
 
 
 // $Log$
+// Revision 1.22  1999/02/26 22:10:04  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.21  1998/12/09 18:50:32  curt
 // Converted "class fgVIEW" to "class FGView" and updated to make data
 // members private and make required accessor functions.
diff --git a/Scenery/tilemgr.cxx b/Scenery/tilemgr.cxx
index 858966c04..ba813f900 100644
--- a/Scenery/tilemgr.cxx
+++ b/Scenery/tilemgr.cxx
@@ -35,8 +35,8 @@
 
 #include <Aircraft/aircraft.hxx>
 
-#include <Bucket/bucketutils.hxx>
 #include <Debug/logstream.hxx>
+#include <Bucket/bucketutils.hxx>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
 #include <Main/views.hxx>
@@ -758,6 +758,9 @@ void fgTileMgrRender( void ) {
 
 
 // $Log$
+// Revision 1.54  1999/02/26 22:10:05  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.53  1999/02/05 21:29:16  curt
 // Modifications to incorporate Jon S. Berndts flight model code.
 //
diff --git a/Time/event.hxx b/Time/event.hxx
index 2ef1a8844..d9e810210 100644
--- a/Time/event.hxx
+++ b/Time/event.hxx
@@ -31,20 +31,23 @@
 #endif                                   
 
 
-#include "Include/compiler.h"
-#include "Include/fg_callback.hxx"
+#include <Include/compiler.h>
+#include <Include/fg_callback.hxx>
 
 #include <deque>        // STL double ended queue
 #include <list>         // STL list
-#include <string>
+#include STL_STRING
+
+#include "fg_time.hxx"
+#include "timestamp.hxx"
 
 FG_USING_STD(deque);
 FG_USING_STD(list);
 FG_USING_STD(string);
 
-#include "fg_time.hxx"
-#include "timestamp.hxx"
-
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+FG_USING_NAMESPACE(std);
+#endif
 
 class fgEVENT
 {
@@ -166,6 +169,9 @@ extern fgEVENT_MGR global_events;
 
 
 // $Log$
+// Revision 1.17  1999/02/26 22:10:08  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.16  1999/01/09 13:37:43  curt
 // Convert fgTIMESTAMP to FGTimeStamp which holds usec instead of ms.
 //
diff --git a/Time/fg_time.cxx b/Time/fg_time.cxx
index f7a1c6e40..ac6eb9f32 100644
--- a/Time/fg_time.cxx
+++ b/Time/fg_time.cxx
@@ -27,7 +27,7 @@
 #  include <config.h>
 #endif
 
-#include "Include/compiler.h"
+#include <Include/compiler.h>
 
 #ifdef FG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -51,9 +51,9 @@
 #  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
 #endif
 
+#include <Debug/logstream.hxx>
 #include <Astro/sky.hxx>
 #include <Astro/solarsystem.hxx>
-#include <Debug/logstream.hxx>
 #include <FDM/flight.hxx>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
@@ -399,6 +399,9 @@ void fgTimeUpdate(FGInterface *f, fgTIME *t) {
 
 
 // $Log$
+// Revision 1.32  1999/02/26 22:10:10  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.31  1999/02/05 21:29:18  curt
 // Modifications to incorporate Jon S. Berndts flight model code.
 //
diff --git a/Time/sunpos.cxx b/Time/sunpos.cxx
index 0a29b35a3..5dc34647c 100644
--- a/Time/sunpos.cxx
+++ b/Time/sunpos.cxx
@@ -39,7 +39,8 @@
 #  include <config.h>
 #endif
 
-#include "Include/compiler.h"
+#include <Include/compiler.h>
+
 #ifdef FG_HAVE_STD_INCLUDES
 #  include <cmath>
 #  include <cstdio>
@@ -50,10 +51,8 @@
 #  include <time.h>
 #endif
 
-
-//#include <Astro/orbits.hxx>
-#include <Astro/solarsystem.hxx>
 #include <Debug/logstream.hxx>
+#include <Astro/solarsystem.hxx>
 #include <Include/fg_constants.h>
 #include <Main/views.hxx>
 #include <Math/fg_geodesy.hxx>
@@ -435,6 +434,9 @@ void fgUpdateSunPos( void ) {
 
 
 // $Log$
+// Revision 1.20  1999/02/26 22:10:11  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.19  1999/01/07 20:25:37  curt
 // Portability changes and updates from Bernie Bright.
 //
-- 
2.39.5