Irix MipsPRO fixes.
This commit is contained in:
parent
e03752883e
commit
fc7e234d3d
11 changed files with 27 additions and 7 deletions
|
@ -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],
|
||||
|
|
|
@ -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],
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -71,7 +71,9 @@
|
|||
|
||||
#include "uiuc_engine.h"
|
||||
|
||||
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
|
||||
SG_USING_STD(cerr);
|
||||
#endif
|
||||
|
||||
void uiuc_engine()
|
||||
{
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 "#"
|
||||
|
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <simgear/compiler.h>
|
||||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include STL_IOSTREAM
|
||||
|
||||
SG_USING_STD(string);
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue