MSVC5 Compatibility tweaks.

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
index 681750cb10f1a62ceaa820478350b66099314d39..878d5232c931dda0ea448b0839fe097a40115b94 100644 (file)
--- 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 934169b7074c6177c9f1b47f6e15b9e82e7833ef..d32985a6ee28094d2a3af9fdfbfb237d93255fb7 100644 (file)
--- 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 52d1658e596dd5346df7de1c5f1fc8d3ed7a92c8..6638e5f81fc8ef909defd0dc0969470149d3ecb2 100644 (file)
--- 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 a3d11f407047cc36db7e611db6d24ae6281870d4..ae9f63bd48292c10cc845090e231125cff420147 100644 (file)
--- 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 25f563ae76ed5ac32c255eaddc9282e765ba314f..19af0737962ba7fbb491eb67d9c45be902396cdb 100644 (file)
--- 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 5fae321b5700c7928d11705d0ef2c2756d82b877..4f988a53e80caaca7e28712a365eddd0e7fa3ee4 100644 (file)
--- 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 5e0a52047cd21b0bad14531572b34009339e550a..c41d5af70083cebd6ed22dfd1c0e4a84de6b4455 100644 (file)
--- 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 d0deb342cd67dbe0e6d3935e4b1efad211951387..60ebf52668c37929a3d894e6a3c8214992131431 100644 (file)
--- 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 d3a9a06b24dc72ec2a0f812393af0b54a42ea0ec..37ff640f314c08ae7477090eaba4412a0883e9a3 100644 (file)
--- 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 a9ab68c93a5c9f1739d4107700e37ef58df2b51f..b88a7ae40eb74c3153dbbbf81678a8db85d5b917 100644 (file)
--- 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 1514f4e6d38be91ae684773d0b5cd4ac596319e8..9862852bb90411598e2c2db94afb61e1220d8940 100644 (file)
--- 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 5a781a325233ec739b7704d1b0fe1d8347ac6dd6..0feb385be3466919860abb7cd5d66362d640e8df 100644 (file)
--- 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 e6b015ebf792fc2087899adf99364b1101fde87c..22810fff094753c7f564213d06a4c1af99902de9 100644 (file)
--- 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)