From d423fa9337c76b033ef1be8d2321e8c7c44b7ed6 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 24 May 2000 04:27:28 +0000
Subject: [PATCH] MSVC5 Compatibility tweaks.

---
 src/FDM/UIUCModel/uiuc_1DdataFileReader.h  | 5 ++++-
 src/FDM/UIUCModel/uiuc_2DdataFileReader.h  | 6 +++++-
 src/FDM/UIUCModel/uiuc_aerodeflections.h   | 4 ++--
 src/FDM/UIUCModel/uiuc_aircraft.h          | 2 +-
 src/FDM/UIUCModel/uiuc_coefficients.h      | 4 ++--
 src/FDM/UIUCModel/uiuc_convert.h           | 2 +-
 src/FDM/UIUCModel/uiuc_engine.cpp          | 3 +++
 src/FDM/UIUCModel/uiuc_engine.h            | 4 ++--
 src/FDM/UIUCModel/uiuc_menu.h              | 2 +-
 src/FDM/UIUCModel/uiuc_parsefile.cpp       | 3 ++-
 src/FDM/UIUCModel/uiuc_parsefile.h         | 2 +-
 src/FDM/UIUCModel/uiuc_recorder.cpp        | 7 ++++---
 src/FDM/UIUCModel/uiuc_warnings_errors.cpp | 4 ++++
 13 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
index 681750cb1..878d5232c 100644
--- a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
@@ -1,10 +1,13 @@
 #ifndef _1D_DATA_FILE_READER_H_
 #define _1D_DATA_FILE_READER_H_
 
-#include <strstream.h>
+#include <simgear/compiler.h>
+
+#include STL_STRSTREAM
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 
+FG_USING_NAMESPACE(std);
 
 int uiuc_1DdataFileReader( string file_name, 
 			   double convert_x, 
diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
index 934169b70..d32985a6e 100644
--- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
@@ -1,10 +1,14 @@
 #ifndef _2D_DATA_FILE_READER_H_
 #define _2D_DATA_FILE_READER_H_
 
-#include <strstream.h>
+#include <simgear/compiler.h>
+
+#include STL_STRSTREAM
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 
+FG_USING_NAMESPACE(std);
+
 int 
 uiuc_2DdataFileReader( string file_name, double convert_x, double convert_y, double convert_z,
                            double x[100][100], double y[100], double z[100][100], int xmax[100], 
diff --git a/src/FDM/UIUCModel/uiuc_aerodeflections.h b/src/FDM/UIUCModel/uiuc_aerodeflections.h
index 52d1658e5..6638e5f81 100644
--- a/src/FDM/UIUCModel/uiuc_aerodeflections.h
+++ b/src/FDM/UIUCModel/uiuc_aerodeflections.h
@@ -3,8 +3,8 @@
 #define _AERODEFLECTIONS_H_
 
 #include "uiuc_aircraft.h"  /* uses aileron, elevator, rudder               */
-#include "../FDM/LaRCsim/ls_cockpit.h"     /* uses Long_control, Lat_control, Rudder_pedal */
-#include "../FDM/LaRCsim/ls_constants.h"   /* uses RAD_TO_DEG, DEG_TO_RAD                  */
+#include "../LaRCsim/ls_cockpit.h"     /* uses Long_control, Lat_control, Rudder_pedal */
+#include "../LaRCsim/ls_constants.h"   /* uses RAD_TO_DEG, DEG_TO_RAD                  */
 
 void uiuc_aerodeflections();
 
diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h
index a3d11f407..ae9f63bd4 100644
--- a/src/FDM/UIUCModel/uiuc_aircraft.h
+++ b/src/FDM/UIUCModel/uiuc_aircraft.h
@@ -97,7 +97,7 @@
 
 FG_USING_STD(map);
 FG_USING_STD(iostream);
-#ifdef MACOS
+#if defined ( MACOS ) || defined ( _MSC_VER )
 FG_USING_STD(ofstream);
 #endif
 
diff --git a/src/FDM/UIUCModel/uiuc_coefficients.h b/src/FDM/UIUCModel/uiuc_coefficients.h
index 25f563ae7..19af07379 100644
--- a/src/FDM/UIUCModel/uiuc_coefficients.h
+++ b/src/FDM/UIUCModel/uiuc_coefficients.h
@@ -4,8 +4,8 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include "../LaRCsim/ls_generic.h"
 
-extern double Simtime;
+extern "C" SCALAR Simtime;
 
 void uiuc_coefficients();
diff --git a/src/FDM/UIUCModel/uiuc_convert.h b/src/FDM/UIUCModel/uiuc_convert.h
index 5fae321b5..4f988a53e 100644
--- a/src/FDM/UIUCModel/uiuc_convert.h
+++ b/src/FDM/UIUCModel/uiuc_convert.h
@@ -1,7 +1,7 @@
 #ifndef _CONVERT_H_
 #define _CONVERT_H_
 
-#include "../FDM/LaRCsim/ls_constants.h"   /* uses RAD_TO_DEG, DEG_TO_RAD */
+#include "../LaRCsim/ls_constants.h"   /* uses RAD_TO_DEG, DEG_TO_RAD */
 
 double uiuc_convert( int conversionType );
 
diff --git a/src/FDM/UIUCModel/uiuc_engine.cpp b/src/FDM/UIUCModel/uiuc_engine.cpp
index 5e0a52047..c41d5af70 100644
--- a/src/FDM/UIUCModel/uiuc_engine.cpp
+++ b/src/FDM/UIUCModel/uiuc_engine.cpp
@@ -65,9 +65,12 @@
  USA or view http://www.gnu.org/copyleft/gpl.html.
 
 **********************************************************************/
+#include <simgear/compiler.h>
 
 #include "uiuc_engine.h"
 
+FG_USING_STD(cerr);
+
 void uiuc_engine() 
 {
   stack command_list;
diff --git a/src/FDM/UIUCModel/uiuc_engine.h b/src/FDM/UIUCModel/uiuc_engine.h
index d0deb342c..60ebf5266 100644
--- a/src/FDM/UIUCModel/uiuc_engine.h
+++ b/src/FDM/UIUCModel/uiuc_engine.h
@@ -3,8 +3,8 @@
 
 #include "uiuc_aircraft.h"
 #include "uiuc_warnings_errors.h" /* for cerr, exit() */
-#include "../FDM/LaRCsim/ls_generic.h"
-#include "../FDM/LaRCsim/ls_cockpit.h"
+#include "../LaRCsim/ls_generic.h"
+#include "../LaRCsim/ls_cockpit.h"
 
 void uiuc_engine();
 
diff --git a/src/FDM/UIUCModel/uiuc_menu.h b/src/FDM/UIUCModel/uiuc_menu.h
index d3a9a06b2..37ff640f3 100644
--- a/src/FDM/UIUCModel/uiuc_menu.h
+++ b/src/FDM/UIUCModel/uiuc_menu.h
@@ -9,7 +9,7 @@
 #include "uiuc_initializemaps.h"
 #include "uiuc_1DdataFileReader.h"
 #include "uiuc_2DdataFileReader.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include "../LaRCsim/ls_generic.h"
 
 bool check_float(string  &token); // To check whether the token is a float or not
 void uiuc_menu (string aircraft);
diff --git a/src/FDM/UIUCModel/uiuc_parsefile.cpp b/src/FDM/UIUCModel/uiuc_parsefile.cpp
index a9ab68c93..b88a7ae40 100644
--- a/src/FDM/UIUCModel/uiuc_parsefile.cpp
+++ b/src/FDM/UIUCModel/uiuc_parsefile.cpp
@@ -62,10 +62,11 @@
  USA or view http://www.gnu.org/copyleft/gpl.html.
 
 **********************************************************************/
-
+#include <simgear/compiler.h>
 
 #include "uiuc_parsefile.h"
 
+FG_USING_NAMESPACE(std);
 
 ParseFile :: ParseFile (const string fileName)
 {
diff --git a/src/FDM/UIUCModel/uiuc_parsefile.h b/src/FDM/UIUCModel/uiuc_parsefile.h
index 1514f4e6d..9862852bb 100644
--- a/src/FDM/UIUCModel/uiuc_parsefile.h
+++ b/src/FDM/UIUCModel/uiuc_parsefile.h
@@ -9,7 +9,7 @@
 
 FG_USING_STD(string);
 FG_USING_STD(list);
-#ifdef MACOS
+#if defined ( MACOS ) || defined ( _MSC_VER )
 FG_USING_STD(ifstream);
 FG_USING_STD(iostream);
 FG_USING_STD(endl);
diff --git a/src/FDM/UIUCModel/uiuc_recorder.cpp b/src/FDM/UIUCModel/uiuc_recorder.cpp
index 5a781a325..0feb385be 100644
--- a/src/FDM/UIUCModel/uiuc_recorder.cpp
+++ b/src/FDM/UIUCModel/uiuc_recorder.cpp
@@ -75,15 +75,16 @@ void uiuc_recorder(double dt )
   string linetoken;
   static int init = 0;
   string record_variables = "# ";
- 
+  LIST command_line;
+
   command_list = recordParts->getCommands();
   fout << endl;
 
-  for (LIST command_line = command_list.begin(); command_line!=command_list.end(); ++command_line)
+  for ( command_line = command_list.begin(); command_line!=command_list.end(); ++command_line)
           record_variables += recordParts->getToken(*command_line,2) + "  ";
 
   fout << record_variables << endl; 
-  for (LIST command_line = command_list.begin(); command_line!=command_list.end(); ++command_line)
+  for ( command_line = command_list.begin(); command_line!=command_list.end(); ++command_line)
     {
       
       linetoken = recordParts->getToken(*command_line, 2); 
diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
index e6b015ebf..22810fff0 100644
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
@@ -74,8 +74,12 @@ for information.
  USA or view http://www.gnu.org/copyleft/gpl.html.
 
 **********************************************************************/
+#include <simgear/compiler.h>
+
 #include "uiuc_warnings_errors.h"
 
+FG_USING_NAMESPACE(std);
+
 void uiuc_warnings_errors(int errorCode, string line)
 {
   switch (errorCode)