fly/flightgear
1
0
Fork 0
Code Activity

MSVC5 Compatibility tweaks.

Browse source
This commit is contained in:
curt 2000-05-24 04:27:28 +00:00
parent b543d8291e
commit d423fa9337
13 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/FDM/UIUCModel/uiuc_1DdataFileReader.h
View file

@ -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,

6
src/FDM/UIUCModel/uiuc_2DdataFileReader.h
View file

@ -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],

4
src/FDM/UIUCModel/uiuc_aerodeflections.h
View file

@ -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();

2
src/FDM/UIUCModel/uiuc_aircraft.h
View file

@ -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

4
src/FDM/UIUCModel/uiuc_coefficients.h
View file

@ -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();

2
src/FDM/UIUCModel/uiuc_convert.h
View file

@ -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 );

3
src/FDM/UIUCModel/uiuc_engine.cpp
View file

@ -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;

4
src/FDM/UIUCModel/uiuc_engine.h
View file

@ -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();

2
src/FDM/UIUCModel/uiuc_menu.h
View file

@ -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);

3
src/FDM/UIUCModel/uiuc_parsefile.cpp
View file

@ -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)
{

2
src/FDM/UIUCModel/uiuc_parsefile.h
View file

@ -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);

7
src/FDM/UIUCModel/uiuc_recorder.cpp
View file

@ -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);

4
src/FDM/UIUCModel/uiuc_warnings_errors.cpp
View file

@ -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)