Patches from Erik Hofman for SGI compatibility:

Some more cmall changes to the SimGear header files and removed the
SG_HAVE_NATIVE_SGI_COMPILERS dependancies from FlightGear.

I've added a seperate JSBSim patch for the JSBSim source tree.

diff --git a/src/ATC/ATC.hxx b/src/ATC/ATC.hxx
index 777ccdbd8607cdc19ec6b38c50d11c7c3d17530b..143b3080ae05bb8e77687f3a2203b2818738f0d2 100644 (file)
--- a/src/ATC/ATC.hxx
+++ b/src/ATC/ATC.hxx
@@ -27,9 +27,7 @@
 #include STL_IOSTREAM
 #include STL_STRING
 
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(ostream);
-#endif
 SG_USING_STD(string);
 
 // Possible types of ATC type that the radios may be tuned to.

diff --git a/src/ATC/ATCVoice.hxx b/src/ATC/ATCVoice.hxx
index 5b61f75c0725a9952d43c42365ce5c38867c0bac..8edd8953eb8bdba410ea7b14a8f2528239efafbe 100644 (file)
--- a/src/ATC/ATCVoice.hxx
+++ b/src/ATC/ATCVoice.hxx
@@ -23,13 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <fstream>
-#  include <iostream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <fstream.h>
-#  include <iostream.h>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
+#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
 #  include <fstream>
 #  include <iostream>
 #else
@@ -45,12 +39,10 @@ SG_USING_STD(map);
 SG_USING_STD(list);
 SG_USING_STD(string);
 
-#if !defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(cout);
 SG_USING_STD(ios);
 SG_USING_STD(ofstream);
 SG_USING_STD(ifstream);
-#endif
 
 
 struct WordData {

diff --git a/src/ATC/approach.hxx b/src/ATC/approach.hxx
index 92b91e40c3424f8d193d007d02c45db3d150d1fe..0dfe949aeac0a43af00be82efad947b457ffea94 100644 (file)
--- a/src/ATC/approach.hxx
+++ b/src/ATC/approach.hxx
@@ -36,8 +36,6 @@
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
 #include <iomanip>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
 #elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
@@ -45,10 +43,7 @@
 #include <iomanip.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
-
 SG_USING_STD(string);
 
 #include "ATC.hxx"

diff --git a/src/ATC/atis.cxx b/src/ATC/atis.cxx
index 27f2200c429ce2a857889b6f2a0c9fb68ff14621..0aaac233f92b33526cece3051aeaf7bffef44520 100644 (file)
--- a/src/ATC/atis.cxx
+++ b/src/ATC/atis.cxx
@@ -32,9 +32,7 @@
 SG_USING_STD(string);
 
 #include STL_IOSTREAM
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
-#endif
 
 //#include <simgear/debug/logstream.hxx>
 //#include <simgear/misc/sgstream.hxx>

diff --git a/src/ATC/atis.hxx b/src/ATC/atis.hxx
index 2ee92f81e308d3a9cda58df8ecfca49f58a1307a..3ee623573d3b066f171919faa1254bc4ff5666ac 100644 (file)
--- a/src/ATC/atis.hxx
+++ b/src/ATC/atis.hxx
@@ -24,6 +24,7 @@
 #define _FG_ATIS_HXX
 
 #include <stdio.h>
+#include <string>
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
@@ -34,8 +35,6 @@
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
 #  include <iomanip>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
 #elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
@@ -43,12 +42,7 @@
 #  include <iomanip.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
-
-#include <string>
-
 SG_USING_STD(string);
 
 #include "ATC.hxx"

diff --git a/src/ATC/ground.hxx b/src/ATC/ground.hxx
index 924601faaf8bddaa1223983c92bf4dd9876772e7..236370997b2bd329cc5198915268dace6b39f24f 100644 (file)
--- a/src/ATC/ground.hxx
+++ b/src/ATC/ground.hxx
@@ -25,9 +25,7 @@
 #include STL_STRING
 
 SG_USING_STD(string);
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(ios);
-#endif
 
 #include <map>
 #include <vector>

diff --git a/src/ATC/tower.hxx b/src/ATC/tower.hxx
index a73a4ebeb2425c15c9c564ca2d6de68dc4e1ed99..8b38f371ae3213fbba5760aed0e0aa66a6942d06 100644 (file)
--- a/src/ATC/tower.hxx
+++ b/src/ATC/tower.hxx
@@ -31,9 +31,7 @@
 #include STL_STRING
 
 SG_USING_STD(string);
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(ios);
-#endif
 
 #include "ATC.hxx"
 //#include "ATCmgr.hxx"

diff --git a/src/Airports/genrunways.cxx b/src/Airports/genrunways.cxx
index 869e9bb64dbec795fdb2831f152b10eb8bdb6153..f3b4c4709ed0fa2a6466cc6c7f8469d9fa7f9a10 100644 (file)
--- a/src/Airports/genrunways.cxx
+++ b/src/Airports/genrunways.cxx
@@ -8,10 +8,8 @@
 
 #include "runways.hxx"
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 int main( int argc, char **argv ) {
     FGRunwaysUtil runways;

diff --git a/src/Airports/gensimple.cxx b/src/Airports/gensimple.cxx
index 29db04eb396d2c4a4c6693da9e8cc7194cdd136d..0d9f6085012db5a08cf01ca86dddc8d9d4a72c6a 100644 (file)
--- a/src/Airports/gensimple.cxx
+++ b/src/Airports/gensimple.cxx
@@ -8,10 +8,8 @@
 
 #include "simple.hxx"
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 int main( int argc, char **argv ) {
     FGAirportsUtil airports;

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index 3d16a3dd9388965712a0e08d4e66b434e0f5b5d7..481f00c9572785ab5186d5e12ae68bf3711de622 100644 (file)
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -54,17 +54,13 @@ SG_USING_NAMESPACE(std);
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
 #elif defined( __BORLANDC__ ) || defined (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 inline istream&
 operator >> ( istream& in, FGRunway& a )

diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index 4d74af4b4099926cab89d36b2f19c5a99bc45148..ba19df66a1724226c560035010c686fd6d7c520b 100644 (file)
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -51,16 +51,12 @@ SG_USING_NAMESPACE(std);
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
 #elif defined( __BORLANDC__ ) || defined (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 
 inline istream&

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index fa7bf18f05a7d10ddf246c984f8256c8e153d45b..474ed4aa45d3a3e17fa985c6ed4bb71f17cbd8bb 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -50,10 +50,8 @@
 //built-in layers
 #include "built_in/FGMagRibbon.hxx"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(istream);
 SG_USING_STD(ifstream);
-#endif
 SG_USING_STD(string);
 
 

diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx
index 6aea75e23d83dbf947858a2010618aa64ac70704..ab5dba87b70b34dbe24b67b17936b489f60939f2 100644 (file)
--- a/src/Cockpit/panel_io.hxx
+++ b/src/Cockpit/panel_io.hxx
@@ -33,9 +33,7 @@
 
 #include STL_IOSTREAM
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(istream);
-#endif
 
 extern FGPanel * fgReadPanel (istream &input);
 extern FGPanel * fgReadPanel (const string &relative_path);

diff --git a/src/FDM/IO360.cxx b/src/FDM/IO360.cxx
index c75b9b3f2fea84f37ca9d4ac62a46a1444b9474d..9c256b29a352c557c77c7f15d13ac5ce37b02b3d 100644 (file)
--- a/src/FDM/IO360.cxx
+++ b/src/FDM/IO360.cxx
@@ -26,9 +26,7 @@
 #include STL_FSTREAM
 #include STL_IOSTREAM
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
-#endif
 
 #include "IO360.hxx"
 #include "LaRCsim/ls_constants.h"

diff --git a/src/FDM/IO360.hxx b/src/FDM/IO360.hxx
index 6eccec8509293b292995af51d5a673b245d47d78..1f0df8d7ce7fd417d38d625930571cdc3a2d06e7 100644 (file)
--- a/src/FDM/IO360.hxx
+++ b/src/FDM/IO360.hxx
@@ -30,9 +30,7 @@
 #include STL_IOSTREAM
 #include STL_FSTREAM
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ofstream);
-#endif
 
 class FGNewEngine {
 

diff --git a/src/FDM/JSBSim/FGColumnVector3.h b/src/FDM/JSBSim/FGColumnVector3.h
index 032333cfac1f6bbd50bf435efe5cb98a033c5a78..dad53abf0b690af4c975209e0f8656defdefa842 100644 (file)
--- a/src/FDM/JSBSim/FGColumnVector3.h
+++ b/src/FDM/JSBSim/FGColumnVector3.h
@@ -26,13 +26,11 @@ INCLUDES
 #  include STL_FSTREAM
 #  include STL_IOSTREAM
    SG_USING_STD(string);
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(ostream);
-     SG_USING_STD(istream);
-     SG_USING_STD(cerr);
-     SG_USING_STD(cout);
-     SG_USING_STD(endl);
-#  endif
+   SG_USING_STD(ostream);
+   SG_USING_STD(istream);
+   SG_USING_STD(cerr);
+   SG_USING_STD(cout);
+   SG_USING_STD(endl);
 #else
 #  include <string>
 #  if defined(sgi) && !defined(__GNUC__)

diff --git a/src/FDM/JSBSim/FGColumnVector4.h b/src/FDM/JSBSim/FGColumnVector4.h
index d1e10d80245a8b64db2cc1490f30d93824e7ba4a..eca61df038e8d26226647cf343ffb0c6f2a5aa32 100644 (file)
--- a/src/FDM/JSBSim/FGColumnVector4.h
+++ b/src/FDM/JSBSim/FGColumnVector4.h
@@ -26,13 +26,11 @@ INCLUDES
 #  include STL_FSTREAM
 #  include STL_IOSTREAM
    SG_USING_STD(string);
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(ostream);
-     SG_USING_STD(istream);
-     SG_USING_STD(cerr);
-     SG_USING_STD(cout);
-     SG_USING_STD(endl);
-#  endif
+   SG_USING_STD(ostream);
+   SG_USING_STD(istream);
+   SG_USING_STD(cerr);
+   SG_USING_STD(cout);
+   SG_USING_STD(endl);
 #else
 #  include <string>
 #  if defined (sgi) && !defined(__GNUC__)

diff --git a/src/FDM/JSBSim/FGConfigFile.h b/src/FDM/JSBSim/FGConfigFile.h
index 8b19d78a1290a44adbc289e01235c850747b6c12..f71367eaf429a2cf0bcefedb3d8fffe10d9e7c53 100644 (file)
--- a/src/FDM/JSBSim/FGConfigFile.h
+++ b/src/FDM/JSBSim/FGConfigFile.h
@@ -44,15 +44,13 @@ INCLUDES
 #  include STL_FSTREAM
 #  include STL_IOSTREAM
    SG_USING_STD(string);
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(ostream);
-     SG_USING_STD(istream);
-     SG_USING_STD(ifstream);
-     SG_USING_STD(cerr);
-     SG_USING_STD(endl);
-     SG_USING_STD(ios);
-     SG_USING_STD(cout);
-#  endif
+   SG_USING_STD(ostream);
+   SG_USING_STD(istream);
+   SG_USING_STD(ifstream);
+   SG_USING_STD(cerr);
+   SG_USING_STD(endl);
+   SG_USING_STD(ios);
+   SG_USING_STD(cout);
 #else
 #  include <string>
 #  if defined(sgi) && !defined(__GNUC__)

diff --git a/src/FDM/JSBSim/FGMatrix33.h b/src/FDM/JSBSim/FGMatrix33.h
index 7eff24dd778f285bd185358778b81ffab22eefc9..74328fa0c9e7dfb1127c6d2a2d8efee86e19f6fc 100644 (file)
--- a/src/FDM/JSBSim/FGMatrix33.h
+++ b/src/FDM/JSBSim/FGMatrix33.h
@@ -28,13 +28,11 @@ INCLUDES
 #  include STL_FSTREAM
 #  include STL_IOSTREAM
    SG_USING_STD(string);
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(ostream);
-     SG_USING_STD(istream);
-     SG_USING_STD(cerr);
-     SG_USING_STD(cout);
-     SG_USING_STD(endl);
-#  endif
+   SG_USING_STD(ostream);
+   SG_USING_STD(istream);
+   SG_USING_STD(cerr);
+   SG_USING_STD(cout);
+   SG_USING_STD(endl);
 #else
 #  include <string>
 #  if defined(sgi) && !defined(__GNUC__)

diff --git a/src/FDM/JSBSim/FGTank.h b/src/FDM/JSBSim/FGTank.h
index 895308d9fe466dc92cac42d0a360745bdb08d8b0..e689112da0b237466f10534222bb30981041d7ae 100644 (file)
--- a/src/FDM/JSBSim/FGTank.h
+++ b/src/FDM/JSBSim/FGTank.h
@@ -51,11 +51,9 @@ INCLUDES
 #  include <simgear/compiler.h>
 #  include STL_STRING
   SG_USING_STD(string);
-# if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-   SG_USING_STD(cerr);
-   SG_USING_STD(endl);
-   SG_USING_STD(cout);
-# endif
+  SG_USING_STD(cerr);
+  SG_USING_STD(endl);
+  SG_USING_STD(cout);
 #else
 # include <string>
   using std::string;

diff --git a/src/FDM/JSBSim/FGfdmSocket.h b/src/FDM/JSBSim/FGfdmSocket.h
index df9c3ec7b6ef9c7dec7e0cea3f83594a42e917f2..a03e58e9c63329a1ac69df9cfa42ad82e27ad467 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.h
+++ b/src/FDM/JSBSim/FGfdmSocket.h
@@ -49,10 +49,8 @@ INCLUDES
 #  include STL_STRING
 #  include STL_IOSTREAM
 #  include STL_FSTREAM
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(cout);
-     SG_USING_STD(endl);
-#  endif
+   SG_USING_STD(cout);
+   SG_USING_STD(endl);
 #else
 #  include <string>
 #  if defined(sgi) && !defined(__GNUC__)

diff --git a/src/FDM/LaRCsimIC.cxx b/src/FDM/LaRCsimIC.cxx
index 4e689fc2542b1577e9265395efa3b66c133765b4..2bc6caa05ce98b96d6c184638c19680a65f42b09 100644 (file)
--- a/src/FDM/LaRCsimIC.cxx
+++ b/src/FDM/LaRCsimIC.cxx
@@ -38,10 +38,8 @@
 #include <FDM/LaRCsim/ls_constants.h>
 #include <FDM/LaRCsim/ls_geodesy.h>
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 
 LaRCsimIC::LaRCsimIC(void) {

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
index d314043da35fe10ce9553e5cf0dae7193d6ecc1f..4a869de39ed44d4de066ba059ade815dde9fe0eb 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
@@ -8,9 +8,7 @@
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(istrstream);
-#endif
 
 int uiuc_1DdataFileReader( string file_name, 
                             double x[100], 

diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
index 708ab1be87f91a390cfb1359655b6042a3924559..c7ab77ae228406d729512e9f8d9880d3316cc371 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
@@ -8,9 +8,7 @@
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(istrstream);
-#endif
 
 void uiuc_2DdataFileReader( string file_name, 
                             double x[100][100], 

diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h
index c74f05bb1dafd5a3d317f40e7b242ac8831f0264..9d7ca959ddccf3a7ceed62c5153062a370c3b32f 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_aircraft.h
+++ b/src/FDM/UIUCModel/uiuc_aircraft.h
@@ -143,10 +143,8 @@
 //#include "uiuc_flapdata.h"
 
 SG_USING_STD(map);
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(iostream);
 SG_USING_STD(ofstream);
-#endif
 
 
 typedef stack :: iterator LIST;

diff --git a/src/FDM/UIUCModel/uiuc_engine.cpp b/src/FDM/UIUCModel/uiuc_engine.cpp
index f7cb61a735ad0e0f6d89b445403a17c383719496..838305a1569c77b6082ee98d9e8f6dcd951983b2 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_engine.cpp
+++ b/src/FDM/UIUCModel/uiuc_engine.cpp
@@ -73,9 +73,7 @@
 
 #include "uiuc_engine.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cerr);
-#endif
 
 void uiuc_engine() 
 {

diff --git a/src/FDM/UIUCModel/uiuc_gear.cpp b/src/FDM/UIUCModel/uiuc_gear.cpp
index 6a739fc73eb852f1091fdccdc0aeec565755e744..99df9b1cb872fa05dae07e751862124cedeee188 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_gear.cpp
+++ b/src/FDM/UIUCModel/uiuc_gear.cpp
@@ -66,9 +66,7 @@
 
 #include "uiuc_gear.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cerr);
-#endif
 
 
 #define HEIGHT_AGL_WHEEL d_wheel_rwy_local_v[2]

diff --git a/src/FDM/UIUCModel/uiuc_menu.cpp b/src/FDM/UIUCModel/uiuc_menu.cpp
index 3f907885cdd3a2aceaf7df4fe392958ab9153d0e..2fd30bba898b6e770a7c38634aa3c7511e259442 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu.cpp
@@ -144,17 +144,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include STL_IOSTREAM
+#include <cstdlib>             // exit
 
 #include "uiuc_menu.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cerr);
 SG_USING_STD(cout);
 SG_USING_STD(endl);
 
-#  ifndef _MSC_VER
+#ifndef _MSC_VER
 SG_USING_STD(exit);
-#  endif
 #endif
 
 bool check_float( const string &token)

diff --git a/src/FDM/UIUCModel/uiuc_parsefile.h b/src/FDM/UIUCModel/uiuc_parsefile.h
index 2b5ac90bf9853474bf701545de3b3ebc1beebf1e..01793842158b6b6b66fad4a6533d5dc3a5fb647c 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_parsefile.h
+++ b/src/FDM/UIUCModel/uiuc_parsefile.h
@@ -10,9 +10,7 @@
 SG_USING_STD(list);
 SG_USING_STD(string);
 SG_USING_STD(getline);
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
-#endif
 
 #define DELIMITERS " \t"
 #define COMMENT "#"

diff --git a/src/FDM/UIUCModel/uiuc_recorder.cpp b/src/FDM/UIUCModel/uiuc_recorder.cpp
index a5ca93c7f212317f7901454d47989401e11c8f2e..5d554def0cc822963ab185efc5b2511d68bd9163 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_recorder.cpp
+++ b/src/FDM/UIUCModel/uiuc_recorder.cpp
@@ -84,9 +84,7 @@
 
 #include "uiuc_recorder.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(endl);            // -dw
-#endif
 
 void uiuc_recorder( double dt )
 {

diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
index 00cf66688a5f5d9e4f95a1c23f27f73bdfaf49ac..02d6f8c4a9ce463a7361c2948147614ddaea6233 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
@@ -76,16 +76,15 @@ for information.
 **********************************************************************/
 #include <stdlib.h>
 #include <string.h>
+#include <cstdlib>             // exit
 
 #include "uiuc_warnings_errors.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD (cerr);
 SG_USING_STD (endl);
 
-#  ifndef _MSC_VER
+#ifndef _MSC_VER
 SG_USING_STD (exit);
-#  endif
 #endif
 
 void uiuc_warnings_errors(int errorCode, string line)

diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index 10b1f362f996d744862d2a35f459bdb2fd4aada9..e00ccda3cace36347831ad0e1861f6d2db95bbf0 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -99,10 +99,8 @@
 //#include "uiuc_network.h"
 //#include "uiuc_get_flapper.h"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 extern "C" void uiuc_init_aeromodel ();
 extern "C" void uiuc_force_moment(double dt);

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index ffbca06a912c2fe3cf0f587bdf104c2c65b661ba..d124c00464c128f5f3f5edc612be42e20a651cbc 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -96,10 +96,7 @@
 #include "sgVec3Slider.hxx"
 
 SG_USING_STD(string);
-
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(cout);
-#endif
 
 // main.cxx hack, should come from an include someplace
 extern void fgInitVisuals( void );

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index 6a87506491d46fb21b6b408dd8e89aab1b01dcd9..f033068e0c70c8158bcb78dd8e299e6a79016cfd 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -71,10 +71,7 @@
 #include "gui_local.hxx"
 
 SG_USING_STD(string);
-
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(cout);
-#endif
 
 /* --------------------------------------------------------------------
 Mouse stuff

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index ffc978697dbb7128770d12048af3aa08ba09ccdb..a5dcffa6cf195c9b41f93df01e1acc4da02a9559 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -28,12 +28,10 @@
 
 #include <jsinput.h>
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(fstream);
 SG_USING_STD(cout);
 SG_USING_STD(endl);
 SG_USING_STD(ios);
-#endif
 SG_USING_STD(string);
 
 string axes_humannames[8] = { "elevator", "ailerons", "rudder", "throttle", 

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 6f86ee0c4e2e5fe5d1de1ae89dcb2f9008c98119..302ab8e08c46e7c4407d2814d217abcf6c012e30 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -61,9 +61,7 @@
 
 #include "input.hxx"
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
-#endif
 SG_USING_STD(string);
 SG_USING_STD(vector);
 

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 758af5dfd2578a2839ba3d9cac736dbada8da98d..0679b4b0d5d9c34b74d48c6df4046ccf201bba34 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -24,10 +24,8 @@
 #include "fg_commands.hxx"
 
 SG_USING_STD(string);
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
 SG_USING_STD(ofstream);
-#endif
 
 #include "fg_props.hxx"
 #include "fg_io.hxx"

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 93c205d1e7f80cd1878c34ba99aeabaad7382ba6..5a2460c3ba381f3a73b5bed2c56a54bfcd4e8433 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -49,10 +49,8 @@
 #include "fgfs.hxx"
 #include "fg_props.hxx"
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(istream);
 SG_USING_STD(ostream);
-#endif
 
 #ifdef FG_WEATHERCM
 static double getWindNorth ();

diff --git a/src/Main/logger.cxx b/src/Main/logger.cxx
index afd32db2cfa8422471cb2f41827ee79b026d3188..e7d02526702850149ca21a044e3e59993484e9e9 100644 (file)
--- a/src/Main/logger.cxx
+++ b/src/Main/logger.cxx
@@ -6,12 +6,10 @@
 #include "logger.hxx"
 
 #include STL_FSTREAM
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
+#include <string>
+
 SG_USING_STD(ofstream);
 SG_USING_STD(endl);
-#endif
-
-#include <string>
 SG_USING_STD(string);
 
 #include <simgear/debug/logstream.hxx>

diff --git a/src/Main/logger.hxx b/src/Main/logger.hxx
index b585210d9033fc3531524444e0456029a1f1706c..bf31bf4171e7593594a24f275f5267de231403d7 100644 (file)
--- a/src/Main/logger.hxx
+++ b/src/Main/logger.hxx
@@ -14,17 +14,15 @@
 #  include <config.h>
 #endif
 
+#include <iostream>
+#include <vector>
+
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/exception.hxx>
 #include <simgear/misc/props.hxx>
 
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
-#include <iostream>
 SG_USING_STD(ostream);
-#endif
-
-#include <vector>
 SG_USING_STD(vector);
 
 #include "fgfs.hxx"

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 029a1c74e0aaa3e675196ec9c6cad1e3d0e38a3f..b74572fb0e162a44f2593baa76a1acc343d947b5 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -33,10 +33,8 @@
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(cerr);
 SG_USING_STD(endl);
-#endif
 
 #include <simgear/misc/exception.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 3507cc4f6e36839709acc9d87fc1dd246e51173b..6129923011dd0e6d55031193a20b194bee7fcb6c 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -11,6 +11,8 @@
 #include "modelmgr.hxx"
 #include "model.hxx"
 
+SG_USING_STD(find);
+
 
 FGModelMgr::FGModelMgr ()
   : _selector(new ssgSelector)

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index bf2bd802a98998fb8e1e47e3822e27d3081cf037..f21dc144307931be430f03d9b038fb8aad8b254c 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -34,17 +34,13 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
 #elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 #include STL_STRING
 SG_USING_STD(string);

diff --git a/src/Navaids/ils.hxx b/src/Navaids/ils.hxx
index 8fd0a2fc26eb0fc821c018065b8198fb2004f6b8..953132d9feac244edd7d97c20cd5904418a2bcfe 100644 (file)
--- a/src/Navaids/ils.hxx
+++ b/src/Navaids/ils.hxx
@@ -31,17 +31,13 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
 #elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 
 #define FG_ILS_DEFAULT_RANGE 18

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index 8bb913743233d559586c99e0a48d3afe4ed183e2..478c47e1eebe2ec1e84be151c722a092d4c8ad68 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -34,17 +34,13 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
 #elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 
 class FGNav {

diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index f89f147300d064e9193aaae2296f02a8243de4ab..162bf45ec6ec92816ce0b45f78d8f774205fba58 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -48,10 +48,8 @@
 #include "httpd.hxx"
 
 SG_USING_STD(string);
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(istrstream);
-#endif
 
 
 bool FGHttpd::open() {

diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx
index 63afbffbdcd841cd3fa9cef01d51a65456355b1e..5cbbc5e0618788f08b983af0dcdaa12bbc7e50e2 100644 (file)
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -47,10 +47,8 @@
 #include "jpg-httpd.hxx"
 
 SG_USING_STD(string);
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(istrstream);
-#endif
 
 
 bool FGJpegHttpd::open() {

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index 551737b3c9f73de5dc347e5f1b9f238300640ebf..de1c870e05215f736431b9fdbd8df4e23c72c784 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -42,10 +42,8 @@
 
 #include "props.hxx"
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(strstream);
 SG_USING_STD(ends);
-#endif
 
 /**
  * Props connection class.

diff --git a/src/WeatherCM/linintp2.cpp b/src/WeatherCM/linintp2.cpp
index 10f610410ebcda2fca98c38f100197ec1f4585d7..d2ff5fe04b63f79f7073790f865e3a25642a0b46 100644 (file)
--- a/src/WeatherCM/linintp2.cpp
+++ b/src/WeatherCM/linintp2.cpp
@@ -37,10 +37,8 @@
 #include <stdlib.h>
 #include "linintp2.h"
 
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_NAMESPACE(std);
 SG_USING_STD(cout);
-#endif
 
 //---------------------------------------------------------------------------
 mgcLinInterp2D::mgcLinInterp2D (int _numPoints, double* x, double* y, 

diff --git a/src/WeatherCM/sphrintp.cpp b/src/WeatherCM/sphrintp.cpp
index 9740a8b7b72c4f6720235678f7de863759d0085f..2366c753b924c71c56e02555d8c7c5652c5cce5e 100644 (file)
--- a/src/WeatherCM/sphrintp.cpp
+++ b/src/WeatherCM/sphrintp.cpp
@@ -35,10 +35,8 @@
 #include <math.h>
 #include "sphrintp.h"
 
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_NAMESPACE(std);
 SG_USING_STD(cout);
-#endif
 
 
 static const double PI = 4.0*atan(1.0);

diff --git a/src/WeatherCM/sphrintp.h b/src/WeatherCM/sphrintp.h
index cf60e9e0ca2a3c50e03e6b87d87f388752d947d0..6083fc1688807d8da9108afd4564452b4dcd7f5e 100644 (file)
--- a/src/WeatherCM/sphrintp.h
+++ b/src/WeatherCM/sphrintp.h
@@ -38,10 +38,8 @@
 #include "linintp2.h"
 #include <plib/sg.h>
 
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_NAMESPACE(std);
 SG_USING_STD(cout);
-#endif
 
 
 class SphereInterpolate