Tweaks for building with native SGI compilers.

[flightgear.git] / Main / fg_init.cxx

diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index 0f4247635ed5234c912a049695c19baa3e803f43..a731711f6b2423bb992f4aa6b710faa3f4977a7b 100644 (file)
--- 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,7 @@
 #include "views.hxx"
 #include "fg_serial.hxx"
 
+FG_USING_STD(string);
 
 extern const char *default_root;
 
@@ -74,7 +77,7 @@ extern const char *default_root;
 // Set initial position and orientation
 int fgInitPosition( void ) {
     string id;
-    FGState *f;
+    FGInterface *f;
 
     f = current_aircraft.fdm_state;
 
@@ -154,7 +157,7 @@ int fgInitGeneral( void ) {
 // Returns non-zero if a problem encountered.
 int fgInitSubsystems( void )
 {
-    FGState *f; // assigned later
+    FGInterface *f; // assigned later
     fgLIGHT *l = &cur_light_params;
     fgTIME *t = &cur_time_params;
     FGView *v = &current_view;
@@ -392,6 +395,15 @@ 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.
+//
+// Revision 1.66  1999/02/05 21:29:10  curt
+// Modifications to incorporate Jon S. Berndts flight model code.
+//
 // Revision 1.65  1999/02/02 20:13:36  curt
 // MSVC++ portability changes by Bernie Bright:
 //