fly/flightgear
1
0
Fork 0
Code Activity

FG_ to SG_ namespace changes.

Browse source
This commit is contained in:
curt 2001-03-23 22:59:18 +00:00
parent 8497f9b1ac
commit 5958389026
80 changed files with 151 additions and 151 deletions

2
src/Airports/runways.cxx
View file

@ -39,7 +39,7 @@
#include "runways.hxx" #include "runways.hxx"
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
FGRunway::FGRunway() { FGRunway::FGRunway() {

10
src/Airports/runways.hxx
View file

@ -38,7 +38,7 @@
#ifdef SG_HAVE_STD_INCLUDES #ifdef SG_HAVE_STD_INCLUDES
# include <istream> # include <istream>
#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h> # include <iostream.h>
#elif defined( __BORLANDC__ ) #elif defined( __BORLANDC__ )
# include <iostream> # include <iostream>
@ -54,11 +54,11 @@
#include <mk4str.h> #include <mk4str.h>
#undef NDEBUG #undef NDEBUG
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(vector); SG_USING_STD(vector);
#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
FG_USING_STD(istream); SG_USING_STD(istream);
#endif #endif

2
src/Airports/simple.cxx
View file

@ -48,7 +48,7 @@
#include "simple.hxx" #include "simple.hxx"
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
FGAirports::FGAirports( const string& file ) { FGAirports::FGAirports( const string& file ) {
// open the specified database readonly // open the specified database readonly

10
src/Airports/simple.hxx
View file

@ -40,7 +40,7 @@
#ifdef SG_HAVE_STD_INCLUDES #ifdef SG_HAVE_STD_INCLUDES
# include <istream> # include <istream>
#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h> # include <iostream.h>
#elif defined( __BORLANDC__ ) #elif defined( __BORLANDC__ )
# include <iostream> # include <iostream>
@ -60,11 +60,11 @@
# undef NDEBUG # undef NDEBUG
#endif #endif
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(set); SG_USING_STD(set);
#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
FG_USING_STD(istream); SG_USING_STD(istream);
#endif #endif

2
src/Autopilot/auto_gui.hxx
View file

@ -35,7 +35,7 @@
#include <FDM/flight.hxx> #include <FDM/flight.hxx>
#include <Controls/controls.hxx> #include <Controls/controls.hxx>
FG_USING_STD(string); SG_USING_STD(string);
// Defines // Defines

6
src/Cockpit/hud.hxx
View file

@ -59,9 +59,9 @@
#include "hud_opts.hxx" #include "hud_opts.hxx"
FG_USING_STD(deque); SG_USING_STD(deque);
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
// some of Norman's crazy optimizations. :-) // some of Norman's crazy optimizations. :-)

4
src/Cockpit/panel.hxx
View file

@ -49,8 +49,8 @@
#include <Main/fgfs.hxx> #include <Main/fgfs.hxx>
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_STD(map); SG_USING_STD(map);
class FGPanelInstrument; class FGPanelInstrument;

8
src/Cockpit/panel_io.cxx
View file

@ -43,11 +43,11 @@
#include "steam.hxx" #include "steam.hxx"
#include "panel_io.hxx" #include "panel_io.hxx"
#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS) #if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
FG_USING_STD(istream); SG_USING_STD(istream);
FG_USING_STD(ifstream); SG_USING_STD(ifstream);
#endif #endif
FG_USING_STD(string); SG_USING_STD(string);

4
src/Cockpit/panel_io.hxx
View file

@ -35,8 +35,8 @@
#include "panel.hxx" #include "panel.hxx"
#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS) #if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
FG_USING_STD(istream); SG_USING_STD(istream);
#endif #endif
extern FGPanel * fgReadPanel (istream &input); extern FGPanel * fgReadPanel (istream &input);

4
src/Cockpit/steam.cxx
View file

@ -23,7 +23,7 @@
# include <config.h> # include <config.h>
#endif #endif
#if defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #if defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h> # include <iostream.h>
#else #else
# include <iostream> # include <iostream>
@ -36,7 +36,7 @@
#include <Main/bfi.hxx> #include <Main/bfi.hxx>
#include <NetworkOLK/features.hxx> #include <NetworkOLK/features.hxx>
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
#include "radiostack.hxx" #include "radiostack.hxx"
#include "steam.hxx" #include "steam.hxx"

2
src/Cockpit/steam.hxx
View file

@ -34,7 +34,7 @@
#include <time.h> #include <time.h>
#include STL_STRING #include STL_STRING
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
/** /**

4
src/FDM/10520d.cxx
View file

@ -54,8 +54,8 @@
#include "10520d.hxx" #include "10520d.hxx"
FG_USING_STD(cout); SG_USING_STD(cout);
FG_USING_STD(endl); SG_USING_STD(endl);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// CODE // CODE

2
src/FDM/IO360.cxx
View file

@ -95,7 +95,7 @@
#include "IO360.hxx" #include "IO360.hxx"
FG_USING_STD(cout); SG_USING_STD(cout);
// Static utility functions // Static utility functions

2
src/FDM/IO360.hxx
View file

@ -56,7 +56,7 @@
#include <fstream> #include <fstream>
#include <math.h> #include <math.h>
FG_USING_STD(ofstream); SG_USING_STD(ofstream);
class FGNewEngine { class FGNewEngine {

2
src/FDM/JSBSim/FGEngine.h
View file

@ -47,7 +47,7 @@ INCLUDES
#ifdef FGFS #ifdef FGFS
# include <simgear/compiler.h> # include <simgear/compiler.h>
# include STL_STRING # include STL_STRING
FG_USING_STD(string); SG_USING_STD(string);
#else #else
# include <string> # include <string>
#endif #endif

4
src/FDM/LaRCsimIC.cxx
View file

@ -38,8 +38,8 @@
#include <FDM/LaRCsim/ls_constants.h> #include <FDM/LaRCsim/ls_constants.h>
#include <FDM/LaRCsim/ls_geodesy.h> #include <FDM/LaRCsim/ls_geodesy.h>
FG_USING_STD(cout); SG_USING_STD(cout);
FG_USING_STD(endl); SG_USING_STD(endl);
LaRCsimIC::LaRCsimIC(void) { LaRCsimIC::LaRCsimIC(void) {

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

@ -8,7 +8,7 @@
#include "uiuc_parsefile.h" #include "uiuc_parsefile.h"
#include "uiuc_aircraft.h" #include "uiuc_aircraft.h"
FG_USING_STD(istrstream); SG_USING_STD(istrstream);
int uiuc_1DdataFileReader( string file_name, int uiuc_1DdataFileReader( string file_name,
double x[100], double x[100],

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

@ -8,7 +8,7 @@
#include "uiuc_parsefile.h" #include "uiuc_parsefile.h"
#include "uiuc_aircraft.h" #include "uiuc_aircraft.h"
FG_USING_STD(istrstream); SG_USING_STD(istrstream);
void uiuc_2DdataFileReader( string file_name, void uiuc_2DdataFileReader( string file_name,
double x[100][100], double x[100][100],

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

@ -101,10 +101,10 @@
#include "uiuc_parsefile.h" #include "uiuc_parsefile.h"
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_STD(iostream); SG_USING_STD(iostream);
#if defined ( macintosh ) || defined ( _MSC_VER ) #if defined ( macintosh ) || defined ( _MSC_VER )
FG_USING_STD(ofstream); SG_USING_STD(ofstream);
#endif #endif

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

@ -71,7 +71,7 @@
#include "uiuc_engine.h" #include "uiuc_engine.h"
FG_USING_STD(cerr); SG_USING_STD(cerr);
void uiuc_engine() void uiuc_engine()
{ {

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

@ -102,12 +102,12 @@
#include "uiuc_menu.h" #include "uiuc_menu.h"
FG_USING_STD(cerr); SG_USING_STD(cerr);
FG_USING_STD(cout); SG_USING_STD(cout);
FG_USING_STD(endl); SG_USING_STD(endl);
#ifndef _MSC_VER #ifndef _MSC_VER
FG_USING_STD(exit); SG_USING_STD(exit);
#endif #endif
bool check_float(string &token) bool check_float(string &token)

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

@ -7,10 +7,10 @@
#include <list> #include <list>
#include <fstream> #include <fstream>
FG_USING_STD(list); SG_USING_STD(list);
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(getline); SG_USING_STD(getline);
FG_USING_STD(ifstream); SG_USING_STD(ifstream);
#define DELIMITERS " \t" #define DELIMITERS " \t"
#define COMMENT "#" #define COMMENT "#"

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

@ -72,7 +72,7 @@
#include "uiuc_recorder.h" #include "uiuc_recorder.h"
FG_USING_STD(endl); // -dw SG_USING_STD(endl); // -dw
void uiuc_recorder( double dt ) void uiuc_recorder( double dt )
{ {

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

@ -78,11 +78,11 @@ for information.
#include "uiuc_warnings_errors.h" #include "uiuc_warnings_errors.h"
FG_USING_STD (cerr); SG_USING_STD (cerr);
FG_USING_STD (endl); SG_USING_STD (endl);
#ifndef _MSC_VER #ifndef _MSC_VER
FG_USING_STD (exit); SG_USING_STD (exit);
#endif #endif
void uiuc_warnings_errors(int errorCode, string line) void uiuc_warnings_errors(int errorCode, string line)

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

@ -6,7 +6,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
FG_USING_STD(string); SG_USING_STD(string);
void uiuc_warnings_errors(int errorCode, string line); void uiuc_warnings_errors(int errorCode, string line);

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

@ -75,8 +75,8 @@
#include "uiuc_betaprobe.h" #include "uiuc_betaprobe.h"
#include <FDM/LaRCsim/ls_generic.h> #include <FDM/LaRCsim/ls_generic.h>
FG_USING_STD(cout); SG_USING_STD(cout);
FG_USING_STD(endl); SG_USING_STD(endl);
extern "C" void uiuc_init_aeromodel (); extern "C" void uiuc_init_aeromodel ();
extern "C" void uiuc_force_moment(double dt); extern "C" void uiuc_force_moment(double dt);

6
src/FDM/flight.hxx
View file

@ -94,9 +94,9 @@
#include <Main/fgfs.hxx> #include <Main/fgfs.hxx>
FG_USING_STD(list); SG_USING_STD(list);
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_STD(string); SG_USING_STD(string);
typedef double FG_VECTOR_3[3]; typedef double FG_VECTOR_3[3];

4
src/FDM/ps-10520c.cxx
View file

@ -54,8 +54,8 @@
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
FG_USING_STD(cout); SG_USING_STD(cout);
FG_USING_STD(endl); SG_USING_STD(endl);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// CODE // CODE

6
src/GUI/gui.cxx
View file

@ -86,10 +86,10 @@
#include "net_dlg.hxx" #include "net_dlg.hxx"
#include "sgVec3Slider.hxx" #include "sgVec3Slider.hxx"
FG_USING_STD(string); SG_USING_STD(string);
#ifndef FG_HAVE_NATIVE_SGI_COMPILERS #ifndef SG_HAVE_NATIVE_SGI_COMPILERS
FG_USING_STD(cout); SG_USING_STD(cout);
#endif #endif
// main.cxx hack, should come from an include someplace // main.cxx hack, should come from an include someplace

6
src/GUI/mouse.cxx
View file

@ -78,10 +78,10 @@
#include "gui.h" #include "gui.h"
#include "gui_local.hxx" #include "gui_local.hxx"
FG_USING_STD(string); SG_USING_STD(string);
#ifndef FG_HAVE_NATIVE_SGI_COMPILERS #ifndef SG_HAVE_NATIVE_SGI_COMPILERS
FG_USING_STD(cout); SG_USING_STD(cout);
#endif #endif
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------

4
src/Include/auto_ptr.hxx
View file

@ -45,7 +45,7 @@ public:
a.owns = 0; a.owns = 0;
} }
#ifdef _FG_MEMBER_TEMPLATES #ifdef _SG_MEMBER_TEMPLATES
template <class T> auto_ptr(const auto_ptr<T>& a) template <class T> auto_ptr(const auto_ptr<T>& a)
: ptr(a.ptr), owns(a.owns) { : ptr(a.ptr), owns(a.owns) {
a.owns = 0; a.owns = 0;
@ -62,7 +62,7 @@ public:
} }
} }
#ifdef _FG_MEMBER_TEMPLATES #ifdef _SG_MEMBER_TEMPLATES
template <class T> auto_ptr& operator = (const auto_ptr<T>& a) { template <class T> auto_ptr& operator = (const auto_ptr<T>& a) {
if (&a != this) { if (&a != this) {
if (owns) if (owns)

4
src/Joystick/joystick.cxx
View file

@ -42,8 +42,8 @@
#include "joystick.hxx" #include "joystick.hxx"
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(cout); SG_USING_STD(cout);
#ifdef WIN32 #ifdef WIN32
static const int MAX_JOYSTICKS = 2; static const int MAX_JOYSTICKS = 2;

2
src/Main/bfi.cxx
View file

@ -52,7 +52,7 @@
#include "fg_init.hxx" #include "fg_init.hxx"
#include "fg_props.hxx" #include "fg_props.hxx"
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
#include "bfi.hxx" #include "bfi.hxx"

2
src/Main/bfi.hxx
View file

@ -27,7 +27,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
/** /**

2
src/Main/fg_init.cxx
View file

@ -107,7 +107,7 @@
#include <GL/xmesa.h> #include <GL/xmesa.h>
#endif #endif
FG_USING_STD(string); SG_USING_STD(string);
extern const char *default_root; extern const char *default_root;

2
src/Main/fg_io.cxx
View file

@ -46,7 +46,7 @@
#include "globals.hxx" #include "globals.hxx"
FG_USING_STD(string); SG_USING_STD(string);
// define the global I/O channel list // define the global I/O channel list

4
src/Main/globals.hxx
View file

@ -39,8 +39,8 @@
#include <Sound/soundmgr.hxx> #include <Sound/soundmgr.hxx>
#include "viewmgr.hxx" #include "viewmgr.hxx"
FG_USING_STD( vector ); SG_USING_STD( vector );
FG_USING_STD( string ); SG_USING_STD( string );
typedef vector<string> string_list; typedef vector<string> string_list;

4
src/Main/options.cxx
View file

@ -55,8 +55,8 @@ bool global_fullscreen = true;
#include "fg_props.hxx" #include "fg_props.hxx"
#include "options.hxx" #include "options.hxx"
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
#define NEW_DEFAULT_MODEL_HZ 120 #define NEW_DEFAULT_MODEL_HZ 120

2
src/Main/viewmgr.hxx
View file

@ -41,7 +41,7 @@
#include "viewer_lookat.hxx" #include "viewer_lookat.hxx"
#include "viewer_rph.hxx" #include "viewer_rph.hxx"
FG_USING_STD(vector); SG_USING_STD(vector);
// Define a structure containing view information // Define a structure containing view information

8
src/Navaids/fix.hxx
View file

@ -30,7 +30,7 @@
#ifdef SG_HAVE_STD_INCLUDES #ifdef SG_HAVE_STD_INCLUDES
# include <istream> # include <istream>
#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h> # include <iostream.h>
#elif defined( __BORLANDC__ ) #elif defined( __BORLANDC__ )
# include <iostream> # include <iostream>
@ -38,12 +38,12 @@
# include <istream.h> # include <istream.h>
#endif #endif
#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
FG_USING_STD(istream); SG_USING_STD(istream);
#endif #endif
#include STL_STRING #include STL_STRING
FG_USING_STD(string); SG_USING_STD(string);
class FGFix { class FGFix {

6
src/Navaids/fixlist.hxx
View file

@ -34,9 +34,9 @@
#include "fix.hxx" #include "fix.hxx"
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_STD(string); SG_USING_STD(string);
class FGFixList { class FGFixList {

6
src/Navaids/ils.hxx
View file

@ -31,7 +31,7 @@
#ifdef SG_HAVE_STD_INCLUDES #ifdef SG_HAVE_STD_INCLUDES
# include <istream> # include <istream>
#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h> # include <iostream.h>
#elif defined( __BORLANDC__ ) #elif defined( __BORLANDC__ )
# include <iostream> # include <iostream>
@ -39,8 +39,8 @@
# include <istream.h> # include <istream.h>
#endif #endif
#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
FG_USING_STD(istream); SG_USING_STD(istream);
#endif #endif

4
src/Navaids/ilslist.hxx
View file

@ -33,8 +33,8 @@
#include "ils.hxx" #include "ils.hxx"
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_STD(vector); SG_USING_STD(vector);
class FGILSList { class FGILSList {

4
src/Navaids/mkrbeacons.hxx
View file

@ -33,8 +33,8 @@
#include "nav.hxx" #include "nav.hxx"
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_STD(vector); SG_USING_STD(vector);
class FGBeacon { class FGBeacon {

6
src/Navaids/nav.hxx
View file

@ -34,7 +34,7 @@
#ifdef SG_HAVE_STD_INCLUDES #ifdef SG_HAVE_STD_INCLUDES
# include <istream> # include <istream>
#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h> # include <iostream.h>
#elif defined( __BORLANDC__ ) #elif defined( __BORLANDC__ )
# include <iostream> # include <iostream>
@ -42,8 +42,8 @@
# include <istream.h> # include <istream.h>
#endif #endif
#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
FG_USING_STD(istream); SG_USING_STD(istream);
#endif #endif

4
src/Navaids/navlist.hxx
View file

@ -33,8 +33,8 @@
#include "nav.hxx" #include "nav.hxx"
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_STD(vector); SG_USING_STD(vector);
class FGNavList { class FGNavList {

2
src/Network/atlas.hxx
View file

@ -31,7 +31,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGAtlas : public FGProtocol { class FGAtlas : public FGProtocol {

2
src/Network/garmin.hxx
View file

@ -31,7 +31,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGGarmin : public FGProtocol { class FGGarmin : public FGProtocol {

2
src/Network/joyclient.hxx
View file

@ -33,7 +33,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGJoyClient : public FGProtocol { class FGJoyClient : public FGProtocol {

2
src/Network/native.hxx
View file

@ -33,7 +33,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGNative : public FGProtocol { class FGNative : public FGProtocol {

2
src/Network/nmea.hxx
View file

@ -31,7 +31,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGNMEA : public FGProtocol { class FGNMEA : public FGProtocol {

4
src/Network/props.cxx
View file

@ -35,8 +35,8 @@
#include "props.hxx" #include "props.hxx"
FG_USING_STD(cout); SG_USING_STD(cout);
FG_USING_STD(istrstream); SG_USING_STD(istrstream);
FGProps::FGProps() { FGProps::FGProps() {
} }

2
src/Network/props.hxx
View file

@ -32,7 +32,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
const static int max_cmd_len = 256; const static int max_cmd_len = 256;

4
src/Network/protocol.hxx
View file

@ -30,8 +30,8 @@
#include STL_STRING #include STL_STRING
#include <vector> #include <vector>
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(vector); SG_USING_STD(vector);
#define FG_MAX_MSG_SIZE 16384 #define FG_MAX_MSG_SIZE 16384

2
src/Network/pve.hxx
View file

@ -31,7 +31,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGPVE : public FGProtocol { class FGPVE : public FGProtocol {

2
src/Network/ray.hxx
View file

@ -33,7 +33,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGRAY : public FGProtocol { class FGRAY : public FGProtocol {

2
src/Network/rul.hxx
View file

@ -32,7 +32,7 @@
#include "protocol.hxx" #include "protocol.hxx"
FG_USING_STD(string); SG_USING_STD(string);
class FGRUL : public FGProtocol { class FGRUL : public FGProtocol {

4
src/NetworkOLK/features.cxx
View file

@ -23,7 +23,7 @@
# include <config.h> # include <config.h>
#endif #endif
#if defined( FG_HAVE_NATIVE_SGI_COMPILERS ) #if defined( SG_HAVE_NATIVE_SGI_COMPILERS )
# include <iostream.h> # include <iostream.h>
#else #else
# include <iostream> # include <iostream>
@ -31,7 +31,7 @@
#include <simgear/math/sg_types.hxx> #include <simgear/math/sg_types.hxx>
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
#include "features.hxx" #include "features.hxx"

2
src/NetworkOLK/features.hxx
View file

@ -34,7 +34,7 @@
#include <time.h> #include <time.h>
#include STL_STRING #include STL_STRING
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
/* /*

2
src/Objects/matlib.cxx
View file

@ -52,7 +52,7 @@
#include "matlib.hxx" #include "matlib.hxx"
FG_USING_STD(string); SG_USING_STD(string);
// global material management class // global material management class

8
src/Objects/matlib.hxx
View file

@ -51,10 +51,10 @@
#include "newmat.hxx" #include "newmat.hxx"
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_STD(less); SG_USING_STD(less);
// Material management class // Material management class

2
src/Objects/newmat.hxx
View file

@ -46,7 +46,7 @@
#include STL_STRING // Standard C++ string library #include STL_STRING // Standard C++ string library
FG_USING_STD(string); SG_USING_STD(string);
// MSVC++ 6.0 kuldge - Need forward declaration of friends. // MSVC++ 6.0 kuldge - Need forward declaration of friends.

4
src/Objects/obj.cxx
View file

@ -57,8 +57,8 @@
#include "matlib.hxx" #include "matlib.hxx"
#include "obj.hxx" #include "obj.hxx"
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(vector); SG_USING_STD(vector);
typedef vector < int > int_list; typedef vector < int > int_list;

2
src/Objects/obj.hxx
View file

@ -48,7 +48,7 @@
#include <Scenery/tileentry.hxx> #include <Scenery/tileentry.hxx>
FG_USING_STD(string); SG_USING_STD(string);
// duplicated from the TerraGear tools // duplicated from the TerraGear tools

2
src/Scenery/hitlist.hxx
View file

@ -11,7 +11,7 @@
#include <plib/ssg.h> #include <plib/ssg.h>
FG_USING_STD(vector); SG_USING_STD(vector);
class FGHitRec { class FGHitRec {

2
src/Scenery/newcache.cxx
View file

@ -51,7 +51,7 @@
#include "tileentry.hxx" #include "tileentry.hxx"
#include "tilemgr.hxx" // temp, need to delete later #include "tilemgr.hxx" // temp, need to delete later
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
// a cheesy hack (to be fixed later) // a cheesy hack (to be fixed later)
extern ssgBranch *terrain; extern ssgBranch *terrain;

2
src/Scenery/newcache.hxx
View file

@ -47,7 +47,7 @@
#include "tileentry.hxx" #include "tileentry.hxx"
FG_USING_STD(map); SG_USING_STD(map);
typedef map < long, FGTileEntry * > tile_map; typedef map < long, FGTileEntry * > tile_map;

4
src/Scenery/tileentry.cxx
View file

@ -41,8 +41,8 @@
#include "tileentry.hxx" #include "tileentry.hxx"
FG_USING_STD(for_each); SG_USING_STD(for_each);
FG_USING_STD(mem_fun_ref); SG_USING_STD(mem_fun_ref);
// Constructor // Constructor

4
src/Scenery/tileentry.hxx
View file

@ -54,8 +54,8 @@
#include <strings.h> #include <strings.h>
#endif #endif
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_STD(vector); SG_USING_STD(vector);
typedef vector < Point3D > point_list; typedef vector < Point3D > point_list;

2
src/Scenery/tilemgr.hxx
View file

@ -39,7 +39,7 @@
#include "hitlist.hxx" #include "hitlist.hxx"
FG_USING_STD(list); SG_USING_STD(list);
#if defined(USE_MEM) || defined(WIN32) #if defined(USE_MEM) || defined(WIN32)

4
src/Sound/soundmgr.hxx
View file

@ -39,8 +39,8 @@
#include <plib/sl.h> #include <plib/sl.h>
#include <plib/sm.h> #include <plib/sm.h>
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_STD(string); SG_USING_STD(string);
// manages everything we need to know for an individual sound sample // manages everything we need to know for an individual sound sample

6
src/Time/event.cxx
View file

@ -57,9 +57,9 @@
#include "event.hxx" #include "event.hxx"
FG_USING_STD(for_each); SG_USING_STD(for_each);
FG_USING_STD(mem_fun); SG_USING_STD(mem_fun);
FG_USING_STD(string); SG_USING_STD(string);
fgEVENT_MGR global_events; fgEVENT_MGR global_events;

6
src/Time/event.hxx
View file

@ -40,9 +40,9 @@
#include STL_STRING #include STL_STRING
FG_USING_STD(deque); SG_USING_STD(deque);
FG_USING_STD(list); SG_USING_STD(list);
FG_USING_STD(string); SG_USING_STD(string);
class fgEVENT class fgEVENT

2
src/Time/light.cxx
View file

@ -46,7 +46,7 @@
#endif #endif
#include <string> #include <string>
FG_USING_STD(string); SG_USING_STD(string);
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>

2
src/Time/moonpos.hxx
View file

@ -49,7 +49,7 @@
#ifdef SG_HAVE_STD_INCLUDES #ifdef SG_HAVE_STD_INCLUDES
# include <ctime> # include <ctime>
# ifdef macintosh # ifdef macintosh
FG_USING_STD(time_t); SG_USING_STD(time_t);
# endif # endif
#else #else
# include <time.h> # include <time.h>

2
src/Time/sunpos.cxx
View file

@ -45,7 +45,7 @@
# include <cstdio> # include <cstdio>
# include <ctime> # include <ctime>
# ifdef macintosh # ifdef macintosh
FG_USING_STD(time_t); SG_USING_STD(time_t);
# endif # endif
#else #else
# include <math.h> # include <math.h>

6
src/WeatherCM/FGLocalWeatherDatabase.h
View file

@ -71,9 +71,9 @@ HISTORY
/****************************************************************************/ /****************************************************************************/
/* DEFINES */ /* DEFINES */
/****************************************************************************/ /****************************************************************************/
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_STD(string); SG_USING_STD(string);
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
/****************************************************************************/ /****************************************************************************/
/* CLASS DECLARATION */ /* CLASS DECLARATION */

6
src/WeatherCM/FGPhysicalProperties.h
View file

@ -78,9 +78,9 @@ HISTORY
#include "FGCloudItem.h" #include "FGCloudItem.h"
#include "FGSnowRain.h" #include "FGSnowRain.h"
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_STD(map); SG_USING_STD(map);
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
/****************************************************************************/ /****************************************************************************/
/* FOREWARD DEFINITIONS */ /* FOREWARD DEFINITIONS */

4
src/WeatherCM/FGPhysicalProperty.h
View file

@ -67,8 +67,8 @@ HISTORY
#include "FGWeatherDefs.h" #include "FGWeatherDefs.h"
#include "FGPhysicalProperties.h" #include "FGPhysicalProperties.h"
FG_USING_STD(vector); SG_USING_STD(vector);
FG_USING_NAMESPACE(std); SG_USING_NAMESPACE(std);
/****************************************************************************/ /****************************************************************************/
/* used for output: */ /* used for output: */

2
src/WeatherCM/FGWeatherParse.h
View file

@ -71,7 +71,7 @@ HISTORY
/****************************************************************************/ /****************************************************************************/
/* DEFINES */ /* DEFINES */
/****************************************************************************/ /****************************************************************************/
FG_USING_STD(vector); SG_USING_STD(vector);
/****************************************************************************/ /****************************************************************************/
/* CLASS DECLARATION */ /* CLASS DECLARATION */