From fc7e234d3d9efe84f8b9e962132ab5b41addf37a Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 13 Apr 2001 21:00:07 +0000
Subject: [PATCH] Irix MipsPRO fixes.

---
 src/FDM/UIUCModel/uiuc_1DdataFileReader.h  | 4 +++-
 src/FDM/UIUCModel/uiuc_2DdataFileReader.h  | 4 +++-
 src/FDM/UIUCModel/uiuc_aircraft.h          | 2 ++
 src/FDM/UIUCModel/uiuc_engine.cpp          | 2 ++
 src/FDM/UIUCModel/uiuc_gear.cpp            | 2 ++
 src/FDM/UIUCModel/uiuc_menu.cpp            | 4 +++-
 src/FDM/UIUCModel/uiuc_parsefile.h         | 4 +++-
 src/FDM/UIUCModel/uiuc_recorder.cpp        | 2 ++
 src/FDM/UIUCModel/uiuc_warnings_errors.cpp | 4 +++-
 src/FDM/UIUCModel/uiuc_warnings_errors.h   | 2 +-
 src/FDM/UIUCModel/uiuc_wrapper.cpp         | 4 +++-
 11 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
index c129fd2cd..9b289038c 100644
--- 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 56b7e9473..708ab1be8 100644
--- 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 cda2abd2e..996a8adea 100644
--- 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 7511338d3..8f2e3e96a 100644
--- 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 0e72ed4bf..accb7816b 100644
--- 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 1aa2489db..d94d95326 100644
--- 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 20fb8ae57..78e8cbba0 100644
--- 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 98017e8d4..44afd0d88 100644
--- 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 7f9c9a342..b28b70f29 100644
--- 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 88823fc8c..275c19d21 100644
--- 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 4ad4d1c37..bd9049ccd 100644
--- 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";