fly/flightgear
1
0
Fork 0
Code Activity

Patches from Erik Hofman for SGI compatibility:

Browse source 
Some more cmall changes to the SimGear header files and removed the
SG_HAVE_NATIVE_SGI_COMPILERS dependancies from FlightGear.

I've added a seperate JSBSim patch for the JSBSim source tree.
This commit is contained in:
david 2002-12-31 18:26:02 +00:00
parent e4409c5222
commit 71f08e795d
51 changed files with 40 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ATC/ATC.hxx
View file

@ -27,9 +27,7 @@
#include STL_IOSTREAM
#include STL_STRING
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_STD(ostream);
#endif
SG_USING_STD(string);
// Possible types of ATC type that the radios may be tuned to.

10
src/ATC/ATCVoice.hxx
View file

@ -23,13 +23,7 @@
#include <simgear/compiler.h>
#ifdef SG_HAVE_STD_INCLUDES
# include <fstream>
# include <iostream>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <fstream.h>
# include <iostream.h>
#elif defined( __BORLANDC__ ) || (__APPLE__)
#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
# include <fstream>
# include <iostream>
#else
@ -45,12 +39,10 @@ SG_USING_STD(map);
SG_USING_STD(list);
SG_USING_STD(string);
#if !defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(cout);
SG_USING_STD(ios);
SG_USING_STD(ofstream);
SG_USING_STD(ifstream);
#endif
struct WordData {

5
src/ATC/approach.hxx
View file

@ -36,8 +36,6 @@
#ifdef SG_HAVE_STD_INCLUDES
# include <istream>
#include <iomanip>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h>
#elif defined( __BORLANDC__ ) || (__APPLE__)
# include <iostream>
#else
@ -45,10 +43,7 @@
#include <iomanip.h>
#endif
#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(istream);
#endif
SG_USING_STD(string);
#include "ATC.hxx"

2
src/ATC/atis.cxx
View file

@ -32,9 +32,7 @@
SG_USING_STD(string);
#include STL_IOSTREAM
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
//#include <simgear/debug/logstream.hxx>
//#include <simgear/misc/sgstream.hxx>

8
src/ATC/atis.hxx
View file

@ -24,6 +24,7 @@
#define _FG_ATIS_HXX
#include <stdio.h>
#include <string>
#include <simgear/compiler.h>
#include <simgear/math/sg_geodesy.hxx>
@ -34,8 +35,6 @@
#ifdef SG_HAVE_STD_INCLUDES
# include <istream>
# include <iomanip>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h>
#elif defined( __BORLANDC__ ) || (__APPLE__)
# include <iostream>
#else
@ -43,12 +42,7 @@
# include <iomanip.h>
#endif
#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(istream);
#endif
#include <string>
SG_USING_STD(string);
#include "ATC.hxx"

2
src/ATC/ground.hxx
View file

@ -25,9 +25,7 @@
#include STL_STRING
SG_USING_STD(string);
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_STD(ios);
#endif
#include <map>
#include <vector>

2
src/ATC/tower.hxx
View file

@ -31,9 +31,7 @@
#include STL_STRING
SG_USING_STD(string);
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_STD(ios);
#endif
#include "ATC.hxx"
//#include "ATCmgr.hxx"

2
src/Airports/genrunways.cxx
View file

@ -8,10 +8,8 @@
#include "runways.hxx"
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
int main( int argc, char **argv ) {
FGRunwaysUtil runways;

2
src/Airports/gensimple.cxx
View file

@ -8,10 +8,8 @@
#include "simple.hxx"
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
int main( int argc, char **argv ) {
FGAirportsUtil airports;

4
src/Airports/runways.cxx
View file

@ -54,17 +54,13 @@ SG_USING_NAMESPACE(std);
#ifdef SG_HAVE_STD_INCLUDES
# include <istream>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h>
#elif defined( __BORLANDC__ ) || defined (__APPLE__)
# include <iostream>
#else
# include <istream.h>
#endif
#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(istream);
#endif
inline istream&
operator >> ( istream& in, FGRunway& a )

4
src/Airports/simple.cxx
View file

@ -51,16 +51,12 @@ SG_USING_NAMESPACE(std);
#ifdef SG_HAVE_STD_INCLUDES
# include <istream>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h>
#elif defined( __BORLANDC__ ) || defined (__APPLE__)
# include <iostream>
#else
# include <istream.h>
#endif
#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(istream);
#endif
inline istream&

2
src/Cockpit/panel_io.cxx
View file

@ -50,10 +50,8 @@
//built-in layers
#include "built_in/FGMagRibbon.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(istream);
SG_USING_STD(ifstream);
#endif
SG_USING_STD(string);

2
src/Cockpit/panel_io.hxx
View file

@ -33,9 +33,7 @@
#include STL_IOSTREAM
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(istream);
#endif
extern FGPanel * fgReadPanel (istream &input);
extern FGPanel * fgReadPanel (const string &relative_path);

2
src/FDM/IO360.cxx
View file

@ -26,9 +26,7 @@
#include STL_FSTREAM
#include STL_IOSTREAM
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
#include "IO360.hxx"
#include "LaRCsim/ls_constants.h"

2
src/FDM/IO360.hxx
View file

@ -30,9 +30,7 @@
#include STL_IOSTREAM
#include STL_FSTREAM
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ofstream);
#endif
class FGNewEngine {

12
src/FDM/JSBSim/FGColumnVector3.h
View file

@ -26,13 +26,11 @@ INCLUDES
# include STL_FSTREAM
# include STL_IOSTREAM
SG_USING_STD(string);
# if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
# endif
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
#else
# include <string>
# if defined(sgi) && !defined(__GNUC__)

12
src/FDM/JSBSim/FGColumnVector4.h
View file

@ -26,13 +26,11 @@ INCLUDES
# include STL_FSTREAM
# include STL_IOSTREAM
SG_USING_STD(string);
# if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
# endif
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
#else
# include <string>
# if defined (sgi) && !defined(__GNUC__)

16
src/FDM/JSBSim/FGConfigFile.h
View file

@ -44,15 +44,13 @@ INCLUDES
# include STL_FSTREAM
# include STL_IOSTREAM
SG_USING_STD(string);
# if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(ifstream);
SG_USING_STD(cerr);
SG_USING_STD(endl);
SG_USING_STD(ios);
SG_USING_STD(cout);
# endif
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(ifstream);
SG_USING_STD(cerr);
SG_USING_STD(endl);
SG_USING_STD(ios);
SG_USING_STD(cout);
#else
# include <string>
# if defined(sgi) && !defined(__GNUC__)

12
src/FDM/JSBSim/FGMatrix33.h
View file

@ -28,13 +28,11 @@ INCLUDES
# include STL_FSTREAM
# include STL_IOSTREAM
SG_USING_STD(string);
# if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
# endif
SG_USING_STD(ostream);
SG_USING_STD(istream);
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
#else
# include <string>
# if defined(sgi) && !defined(__GNUC__)

8
src/FDM/JSBSim/FGTank.h
View file

@ -51,11 +51,9 @@ INCLUDES
# include <simgear/compiler.h>
# include STL_STRING
SG_USING_STD(string);
# if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cerr);
SG_USING_STD(endl);
SG_USING_STD(cout);
# endif
SG_USING_STD(cerr);
SG_USING_STD(endl);
SG_USING_STD(cout);
#else
# include <string>
using std::string;

6
src/FDM/JSBSim/FGfdmSocket.h
View file

@ -49,10 +49,8 @@ INCLUDES
# include STL_STRING
# include STL_IOSTREAM
# include STL_FSTREAM
# if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
# endif
SG_USING_STD(cout);
SG_USING_STD(endl);
#else
# include <string>
# if defined(sgi) && !defined(__GNUC__)

2
src/FDM/LaRCsimIC.cxx
View file

@ -38,10 +38,8 @@
#include <FDM/LaRCsim/ls_constants.h>
#include <FDM/LaRCsim/ls_geodesy.h>
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
LaRCsimIC::LaRCsimIC(void) {

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

@ -8,9 +8,7 @@
#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],

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

@ -8,9 +8,7 @@
#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],

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

@ -143,10 +143,8 @@
//#include "uiuc_flapdata.h"
SG_USING_STD(map);
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(iostream);
SG_USING_STD(ofstream);
#endif
typedef stack :: iterator LIST;

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

@ -73,9 +73,7 @@
#include "uiuc_engine.h"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cerr);
#endif
void uiuc_engine()
{

2
src/FDM/UIUCModel/uiuc_gear.cpp
View file

@ -66,9 +66,7 @@
#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]

5
src/FDM/UIUCModel/uiuc_menu.cpp
View file

@ -144,17 +144,16 @@
#include <stdlib.h>
#include <string.h>
#include STL_IOSTREAM
#include <cstdlib> // exit
#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_VER
SG_USING_STD(exit);
# endif
#endif
bool check_float( const string &token)

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

@ -10,9 +10,7 @@
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 "#"

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

@ -84,9 +84,7 @@
#include "uiuc_recorder.h"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(endl); // -dw
#endif
void uiuc_recorder( double dt )
{

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

@ -76,16 +76,15 @@ for information.
**********************************************************************/
#include <stdlib.h>
#include <string.h>
#include <cstdlib> // exit
#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)

2
src/FDM/UIUCModel/uiuc_wrapper.cpp
View file

@ -99,10 +99,8 @@
//#include "uiuc_network.h"
//#include "uiuc_get_flapper.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);

3
src/GUI/gui_funcs.cxx
View file

@ -96,10 +96,7 @@
#include "sgVec3Slider.hxx"
SG_USING_STD(string);
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_STD(cout);
#endif
// main.cxx hack, should come from an include someplace
extern void fgInitVisuals( void );

3
src/GUI/mouse.cxx
View file

@ -71,10 +71,7 @@
#include "gui_local.hxx"
SG_USING_STD(string);
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_STD(cout);
#endif
/* --------------------------------------------------------------------
Mouse stuff

2
src/Input/fgjs.cxx
View file

@ -28,12 +28,10 @@
#include <jsinput.h>
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(fstream);
SG_USING_STD(cout);
SG_USING_STD(endl);
SG_USING_STD(ios);
#endif
SG_USING_STD(string);
string axes_humannames[8] = { "elevator", "ailerons", "rudder", "throttle",

2
src/Input/input.cxx
View file

@ -61,9 +61,7 @@
#include "input.hxx"
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ifstream);
#endif
SG_USING_STD(string);
SG_USING_STD(vector);

2
src/Main/fg_commands.cxx
View file

@ -24,10 +24,8 @@
#include "fg_commands.hxx"
SG_USING_STD(string);
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ifstream);
SG_USING_STD(ofstream);
#endif
#include "fg_props.hxx"
#include "fg_io.hxx"

2
src/Main/fg_props.cxx
View file

@ -49,10 +49,8 @@
#include "fgfs.hxx"
#include "fg_props.hxx"
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(istream);
SG_USING_STD(ostream);
#endif
#ifdef FG_WEATHERCM
static double getWindNorth ();

6
src/Main/logger.cxx
View file

@ -6,12 +6,10 @@
#include "logger.hxx"
#include STL_FSTREAM
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
#include <string>
SG_USING_STD(ofstream);
SG_USING_STD(endl);
#endif
#include <string>
SG_USING_STD(string);
#include <simgear/debug/logstream.hxx>

8
src/Main/logger.hxx
View file

@ -14,17 +14,15 @@
# include <config.h>
#endif
#include <iostream>
#include <vector>
#include <simgear/compiler.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/exception.hxx>
#include <simgear/misc/props.hxx>
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
#include <iostream>
SG_USING_STD(ostream);
#endif
#include <vector>
SG_USING_STD(vector);
#include "fgfs.hxx"

2
src/Main/main.cxx
View file

@ -33,10 +33,8 @@
#include <simgear/compiler.h>
#include STL_IOSTREAM
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_STD(cerr);
SG_USING_STD(endl);
#endif
#include <simgear/misc/exception.hxx>
#include <simgear/ephemeris/ephemeris.hxx>

2
src/Model/modelmgr.cxx
View file

@ -11,6 +11,8 @@
#include "modelmgr.hxx"
#include "model.hxx"
SG_USING_STD(find);
FGModelMgr::FGModelMgr ()
: _selector(new ssgSelector)

4
src/Navaids/fix.hxx
View file

@ -34,17 +34,13 @@
#ifdef SG_HAVE_STD_INCLUDES
# include <istream>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h>
#elif defined( __BORLANDC__ ) || (__APPLE__)
# include <iostream>
#else
# include <istream.h>
#endif
#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(istream);
#endif
#include STL_STRING
SG_USING_STD(string);

4
src/Navaids/ils.hxx
View file

@ -31,17 +31,13 @@
#ifdef SG_HAVE_STD_INCLUDES
# include <istream>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h>
#elif defined( __BORLANDC__ ) || (__APPLE__)
# include <iostream>
#else
# include <istream.h>
#endif
#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(istream);
#endif
#define FG_ILS_DEFAULT_RANGE 18

4
src/Navaids/nav.hxx
View file

@ -34,17 +34,13 @@
#ifdef SG_HAVE_STD_INCLUDES
# include <istream>
#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h>
#elif defined( __BORLANDC__ ) || (__APPLE__)
# include <iostream>
#else
# include <istream.h>
#endif
#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
SG_USING_STD(istream);
#endif
class FGNav {

2
src/Network/httpd.cxx
View file

@ -48,10 +48,8 @@
#include "httpd.hxx"
SG_USING_STD(string);
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(istrstream);
#endif
bool FGHttpd::open() {

2
src/Network/jpg-httpd.cxx
View file

@ -47,10 +47,8 @@
#include "jpg-httpd.hxx"
SG_USING_STD(string);
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(istrstream);
#endif
bool FGJpegHttpd::open() {

2
src/Network/props.cxx
View file

@ -42,10 +42,8 @@
#include "props.hxx"
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(strstream);
SG_USING_STD(ends);
#endif
/**
* Props connection class.

2
src/WeatherCM/linintp2.cpp
View file

@ -37,10 +37,8 @@
#include <stdlib.h>
#include "linintp2.h"
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_NAMESPACE(std);
SG_USING_STD(cout);
#endif
//---------------------------------------------------------------------------
mgcLinInterp2D::mgcLinInterp2D (int _numPoints, double* x, double* y,

2
src/WeatherCM/sphrintp.cpp
View file

@ -35,10 +35,8 @@
#include <math.h>
#include "sphrintp.h"
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_NAMESPACE(std);
SG_USING_STD(cout);
#endif
static const double PI = 4.0*atan(1.0);

2
src/WeatherCM/sphrintp.h
View file

@ -38,10 +38,8 @@
#include "linintp2.h"
#include <plib/sg.h>
#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
SG_USING_NAMESPACE(std);
SG_USING_STD(cout);
#endif
class SphereInterpolate