Irix MipsPRO fixes.

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
index c129fd2cd0b2f2af06791869805e5fb23ef39510..9b289038c554e7278412ff12cfe2ce63a484e7eb 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
@@ -3,12 +3,14 @@
 
 #include <simgear/compiler.h>
 
-#include <strstream>
+#include STL_STRSTREAM
 
 #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 56b7e9473773b6d674fcf2052da1e64b85808475..708ab1be87f91a390cfb1359655b6042a3924559 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
@@ -3,12 +3,14 @@
 
 #include <simgear/compiler.h>
 
-#include <strstream>
+#include STL_STRSTREAM
 
 #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 cda2abd2ee4d8f772be33b9f02fc208f72fdff92..996a8adeacb2e940a03cf12a28ab313213f37075 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_aircraft.h
+++ b/src/FDM/UIUCModel/uiuc_aircraft.h
@@ -106,7 +106,9 @@
 #include "uiuc_parsefile.h"
 
 SG_USING_STD(map);
+#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(iostream);
+#endif
 #if defined ( macintosh ) || defined ( _MSC_VER )
 SG_USING_STD(ofstream);
 #endif

diff --git a/src/FDM/UIUCModel/uiuc_engine.cpp b/src/FDM/UIUCModel/uiuc_engine.cpp
index 7511338d387269dacf078e6137d04159a7523681..8f2e3e96ab71833b1f0f67b09c2c8beb83553fe1 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_engine.cpp
+++ b/src/FDM/UIUCModel/uiuc_engine.cpp
@@ -71,7 +71,9 @@
 
 #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 0e72ed4bfa9a455f30a65c7986f9dad3f7414eb4..accb7816b6221f13e58f111dd4f586ea51749e72 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_gear.cpp
+++ b/src/FDM/UIUCModel/uiuc_gear.cpp
@@ -66,7 +66,9 @@
 
 #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 1aa2489db22a93d70849344194697c1c0ca2c176..d94d953263205b768c768ce94532830614899b51 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu.cpp
@@ -104,12 +104,14 @@
 
 #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_VR
 SG_USING_STD(exit);
+#  endif
 #endif
 
 bool check_float(string  &token)

diff --git a/src/FDM/UIUCModel/uiuc_parsefile.h b/src/FDM/UIUCModel/uiuc_parsefile.h
index 20fb8ae57a4aa9b82c382f3ebffa53fff547b27e..78e8cbba0fec1d08776e81e0456ec179be299ab6 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_parsefile.h
+++ b/src/FDM/UIUCModel/uiuc_parsefile.h
@@ -5,12 +5,14 @@
 
 #include <string>
 #include <list>
-#include <fstream>
+#include STL_FSTREAM
 
 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 98017e8d47f602756d6d614ea3513cc293e79963..44afd0d88eb931ff3615ddedac4173eddbdd3c26 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_recorder.cpp
+++ b/src/FDM/UIUCModel/uiuc_recorder.cpp
@@ -72,7 +72,9 @@
 
 #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 7f9c9a3427dfb75ceb1c465141f720ae6cea502f..b28b70f29e2e8448e7638969adb6377b08729847 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
@@ -78,11 +78,13 @@ for information.
 
 #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_warnings_errors.h b/src/FDM/UIUCModel/uiuc_warnings_errors.h
index 88823fc8cd3841660423077c7ef17678d8f75425..275c19d219a593fa2a45dab695f78c4edee7b024 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.h
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.h
@@ -4,7 +4,7 @@
 #include <simgear/compiler.h>
 
 #include <string>
-#include <iostream>
+#include STL_IOSTREAM
 
 SG_USING_STD(string);
 

diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index 4ad4d1c377f15baa1665f19d02bfbc924557b603..bd9049ccd06cb2366fcc839ed954a74257bbba63 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -78,8 +78,10 @@
 #include "uiuc_betaprobe.h"
 #include <FDM/LaRCsim/ls_generic.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);
@@ -93,7 +95,7 @@ void uiuc_init_aeromodel ()
 {
   string aircraft;
 
-  if (aircraft_dir != "")
+  if (aircraft_dir != (string)"")
     aircraft = aircraft_dir + "/";
 
   aircraft += "aircraft.dat";