From 59583890262247d73f48f4f1af21303ea41fda47 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 23 Mar 2001 22:59:18 +0000 Subject: [PATCH] FG_ to SG_ namespace changes. --- src/Airports/runways.cxx | 2 +- src/Airports/runways.hxx | 10 +++++----- src/Airports/simple.cxx | 2 +- src/Airports/simple.hxx | 10 +++++----- src/Autopilot/auto_gui.hxx | 2 +- src/Cockpit/hud.hxx | 6 +++--- src/Cockpit/panel.hxx | 4 ++-- src/Cockpit/panel_io.cxx | 8 ++++---- src/Cockpit/panel_io.hxx | 4 ++-- src/Cockpit/steam.cxx | 4 ++-- src/Cockpit/steam.hxx | 2 +- src/FDM/10520d.cxx | 4 ++-- src/FDM/IO360.cxx | 2 +- src/FDM/IO360.hxx | 2 +- src/FDM/JSBSim/FGEngine.h | 2 +- src/FDM/LaRCsimIC.cxx | 4 ++-- src/FDM/UIUCModel/uiuc_1DdataFileReader.h | 2 +- src/FDM/UIUCModel/uiuc_2DdataFileReader.h | 2 +- src/FDM/UIUCModel/uiuc_aircraft.h | 6 +++--- src/FDM/UIUCModel/uiuc_engine.cpp | 2 +- src/FDM/UIUCModel/uiuc_menu.cpp | 8 ++++---- src/FDM/UIUCModel/uiuc_parsefile.h | 8 ++++---- src/FDM/UIUCModel/uiuc_recorder.cpp | 2 +- src/FDM/UIUCModel/uiuc_warnings_errors.cpp | 6 +++--- src/FDM/UIUCModel/uiuc_warnings_errors.h | 2 +- src/FDM/UIUCModel/uiuc_wrapper.cpp | 4 ++-- src/FDM/flight.hxx | 6 +++--- src/FDM/ps-10520c.cxx | 4 ++-- src/GUI/gui.cxx | 6 +++--- src/GUI/mouse.cxx | 6 +++--- src/Include/auto_ptr.hxx | 4 ++-- src/Joystick/joystick.cxx | 4 ++-- src/Main/bfi.cxx | 2 +- src/Main/bfi.hxx | 2 +- src/Main/fg_init.cxx | 2 +- src/Main/fg_io.cxx | 2 +- src/Main/globals.hxx | 4 ++-- src/Main/options.cxx | 4 ++-- src/Main/viewmgr.hxx | 2 +- src/Navaids/fix.hxx | 8 ++++---- src/Navaids/fixlist.hxx | 6 +++--- src/Navaids/ils.hxx | 6 +++--- src/Navaids/ilslist.hxx | 4 ++-- src/Navaids/mkrbeacons.hxx | 4 ++-- src/Navaids/nav.hxx | 6 +++--- src/Navaids/navlist.hxx | 4 ++-- src/Network/atlas.hxx | 2 +- src/Network/garmin.hxx | 2 +- src/Network/joyclient.hxx | 2 +- src/Network/native.hxx | 2 +- src/Network/nmea.hxx | 2 +- src/Network/props.cxx | 4 ++-- src/Network/props.hxx | 2 +- src/Network/protocol.hxx | 4 ++-- src/Network/pve.hxx | 2 +- src/Network/ray.hxx | 2 +- src/Network/rul.hxx | 2 +- src/NetworkOLK/features.cxx | 4 ++-- src/NetworkOLK/features.hxx | 2 +- src/Objects/matlib.cxx | 2 +- src/Objects/matlib.hxx | 8 ++++---- src/Objects/newmat.hxx | 2 +- src/Objects/obj.cxx | 4 ++-- src/Objects/obj.hxx | 2 +- src/Scenery/hitlist.hxx | 2 +- src/Scenery/newcache.cxx | 2 +- src/Scenery/newcache.hxx | 2 +- src/Scenery/tileentry.cxx | 4 ++-- src/Scenery/tileentry.hxx | 4 ++-- src/Scenery/tilemgr.hxx | 2 +- src/Sound/soundmgr.hxx | 4 ++-- src/Time/event.cxx | 6 +++--- src/Time/event.hxx | 6 +++--- src/Time/light.cxx | 2 +- src/Time/moonpos.hxx | 2 +- src/Time/sunpos.cxx | 2 +- src/WeatherCM/FGLocalWeatherDatabase.h | 6 +++--- src/WeatherCM/FGPhysicalProperties.h | 6 +++--- src/WeatherCM/FGPhysicalProperty.h | 4 ++-- src/WeatherCM/FGWeatherParse.h | 2 +- 80 files changed, 151 insertions(+), 151 deletions(-) diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx index df1c42c74..31d3ad304 100644 --- a/src/Airports/runways.cxx +++ b/src/Airports/runways.cxx @@ -39,7 +39,7 @@ #include "runways.hxx" -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); FGRunway::FGRunway() { diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx index 4b6e5e3d1..2d67b96e4 100644 --- a/src/Airports/runways.hxx +++ b/src/Airports/runways.hxx @@ -38,7 +38,7 @@ #ifdef SG_HAVE_STD_INCLUDES # include -#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #elif defined( __BORLANDC__ ) # include @@ -54,11 +54,11 @@ #include #undef NDEBUG -FG_USING_STD(string); -FG_USING_STD(vector); +SG_USING_STD(string); +SG_USING_STD(vector); -#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) -FG_USING_STD(istream); +#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS ) +SG_USING_STD(istream); #endif diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx index d2d758d2a..381b4fc83 100644 --- a/src/Airports/simple.cxx +++ b/src/Airports/simple.cxx @@ -48,7 +48,7 @@ #include "simple.hxx" -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); FGAirports::FGAirports( const string& file ) { // open the specified database readonly diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx index 1486a5136..05d11101f 100644 --- a/src/Airports/simple.hxx +++ b/src/Airports/simple.hxx @@ -40,7 +40,7 @@ #ifdef SG_HAVE_STD_INCLUDES # include -#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #elif defined( __BORLANDC__ ) # include @@ -60,11 +60,11 @@ # undef NDEBUG #endif -FG_USING_STD(string); -FG_USING_STD(set); +SG_USING_STD(string); +SG_USING_STD(set); -#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) -FG_USING_STD(istream); +#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS ) +SG_USING_STD(istream); #endif diff --git a/src/Autopilot/auto_gui.hxx b/src/Autopilot/auto_gui.hxx index 9892a5ef4..6b7e490d8 100644 --- a/src/Autopilot/auto_gui.hxx +++ b/src/Autopilot/auto_gui.hxx @@ -35,7 +35,7 @@ #include #include -FG_USING_STD(string); +SG_USING_STD(string); // Defines diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx index c7a7d1f66..749839439 100644 --- a/src/Cockpit/hud.hxx +++ b/src/Cockpit/hud.hxx @@ -59,9 +59,9 @@ #include "hud_opts.hxx" -FG_USING_STD(deque); -FG_USING_STD(vector); -FG_USING_NAMESPACE(std); +SG_USING_STD(deque); +SG_USING_STD(vector); +SG_USING_NAMESPACE(std); // some of Norman's crazy optimizations. :-) diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx index 1adc9e811..d0a3820b9 100644 --- a/src/Cockpit/panel.hxx +++ b/src/Cockpit/panel.hxx @@ -49,8 +49,8 @@ #include
-FG_USING_STD(vector); -FG_USING_STD(map); +SG_USING_STD(vector); +SG_USING_STD(map); class FGPanelInstrument; diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx index 0e395a31c..1f63b31f1 100644 --- a/src/Cockpit/panel_io.cxx +++ b/src/Cockpit/panel_io.cxx @@ -43,11 +43,11 @@ #include "steam.hxx" #include "panel_io.hxx" -#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS) -FG_USING_STD(istream); -FG_USING_STD(ifstream); +#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS) +SG_USING_STD(istream); +SG_USING_STD(ifstream); #endif -FG_USING_STD(string); +SG_USING_STD(string); diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx index 5d0d56c08..0f203dfc0 100644 --- a/src/Cockpit/panel_io.hxx +++ b/src/Cockpit/panel_io.hxx @@ -35,8 +35,8 @@ #include "panel.hxx" -#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS) -FG_USING_STD(istream); +#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS) +SG_USING_STD(istream); #endif extern FGPanel * fgReadPanel (istream &input); diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx index 00e82c1c5..57be7d7aa 100644 --- a/src/Cockpit/steam.cxx +++ b/src/Cockpit/steam.cxx @@ -23,7 +23,7 @@ # include #endif -#if defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +#if defined( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #else # include @@ -36,7 +36,7 @@ #include
#include -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); #include "radiostack.hxx" #include "steam.hxx" diff --git a/src/Cockpit/steam.hxx b/src/Cockpit/steam.hxx index b2ffda9ff..c532344fc 100644 --- a/src/Cockpit/steam.hxx +++ b/src/Cockpit/steam.hxx @@ -34,7 +34,7 @@ #include #include STL_STRING -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); /** diff --git a/src/FDM/10520d.cxx b/src/FDM/10520d.cxx index 472ab79a2..a7a59ee94 100644 --- a/src/FDM/10520d.cxx +++ b/src/FDM/10520d.cxx @@ -54,8 +54,8 @@ #include "10520d.hxx" -FG_USING_STD(cout); -FG_USING_STD(endl); +SG_USING_STD(cout); +SG_USING_STD(endl); // ------------------------------------------------------------------------ // CODE diff --git a/src/FDM/IO360.cxx b/src/FDM/IO360.cxx index f0188a75d..5a99294bd 100644 --- a/src/FDM/IO360.cxx +++ b/src/FDM/IO360.cxx @@ -95,7 +95,7 @@ #include "IO360.hxx" -FG_USING_STD(cout); +SG_USING_STD(cout); // Static utility functions diff --git a/src/FDM/IO360.hxx b/src/FDM/IO360.hxx index 5d040b055..de40ec730 100644 --- a/src/FDM/IO360.hxx +++ b/src/FDM/IO360.hxx @@ -56,7 +56,7 @@ #include #include -FG_USING_STD(ofstream); +SG_USING_STD(ofstream); class FGNewEngine { diff --git a/src/FDM/JSBSim/FGEngine.h b/src/FDM/JSBSim/FGEngine.h index e2f405fa9..8c86c2d85 100644 --- a/src/FDM/JSBSim/FGEngine.h +++ b/src/FDM/JSBSim/FGEngine.h @@ -47,7 +47,7 @@ INCLUDES #ifdef FGFS # include # include STL_STRING -FG_USING_STD(string); +SG_USING_STD(string); #else # include #endif diff --git a/src/FDM/LaRCsimIC.cxx b/src/FDM/LaRCsimIC.cxx index e525b4333..69af5ecdd 100644 --- a/src/FDM/LaRCsimIC.cxx +++ b/src/FDM/LaRCsimIC.cxx @@ -38,8 +38,8 @@ #include #include -FG_USING_STD(cout); -FG_USING_STD(endl); +SG_USING_STD(cout); +SG_USING_STD(endl); LaRCsimIC::LaRCsimIC(void) { diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h index f566933a8..c129fd2cd 100644 --- a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h +++ b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h @@ -8,7 +8,7 @@ #include "uiuc_parsefile.h" #include "uiuc_aircraft.h" -FG_USING_STD(istrstream); +SG_USING_STD(istrstream); int uiuc_1DdataFileReader( string file_name, double x[100], diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h index dea205d92..56b7e9473 100644 --- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h +++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h @@ -8,7 +8,7 @@ #include "uiuc_parsefile.h" #include "uiuc_aircraft.h" -FG_USING_STD(istrstream); +SG_USING_STD(istrstream); void uiuc_2DdataFileReader( string file_name, double x[100][100], diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h index d2a5b601b..d6895db9f 100644 --- a/src/FDM/UIUCModel/uiuc_aircraft.h +++ b/src/FDM/UIUCModel/uiuc_aircraft.h @@ -101,10 +101,10 @@ #include "uiuc_parsefile.h" -FG_USING_STD(map); -FG_USING_STD(iostream); +SG_USING_STD(map); +SG_USING_STD(iostream); #if defined ( macintosh ) || defined ( _MSC_VER ) -FG_USING_STD(ofstream); +SG_USING_STD(ofstream); #endif diff --git a/src/FDM/UIUCModel/uiuc_engine.cpp b/src/FDM/UIUCModel/uiuc_engine.cpp index 49e23ab39..7511338d3 100644 --- a/src/FDM/UIUCModel/uiuc_engine.cpp +++ b/src/FDM/UIUCModel/uiuc_engine.cpp @@ -71,7 +71,7 @@ #include "uiuc_engine.h" -FG_USING_STD(cerr); +SG_USING_STD(cerr); void uiuc_engine() { diff --git a/src/FDM/UIUCModel/uiuc_menu.cpp b/src/FDM/UIUCModel/uiuc_menu.cpp index 5a0ac08af..098920880 100644 --- a/src/FDM/UIUCModel/uiuc_menu.cpp +++ b/src/FDM/UIUCModel/uiuc_menu.cpp @@ -102,12 +102,12 @@ #include "uiuc_menu.h" -FG_USING_STD(cerr); -FG_USING_STD(cout); -FG_USING_STD(endl); +SG_USING_STD(cerr); +SG_USING_STD(cout); +SG_USING_STD(endl); #ifndef _MSC_VER -FG_USING_STD(exit); +SG_USING_STD(exit); #endif bool check_float(string &token) diff --git a/src/FDM/UIUCModel/uiuc_parsefile.h b/src/FDM/UIUCModel/uiuc_parsefile.h index d0dc09040..20fb8ae57 100644 --- a/src/FDM/UIUCModel/uiuc_parsefile.h +++ b/src/FDM/UIUCModel/uiuc_parsefile.h @@ -7,10 +7,10 @@ #include #include -FG_USING_STD(list); -FG_USING_STD(string); -FG_USING_STD(getline); -FG_USING_STD(ifstream); +SG_USING_STD(list); +SG_USING_STD(string); +SG_USING_STD(getline); +SG_USING_STD(ifstream); #define DELIMITERS " \t" #define COMMENT "#" diff --git a/src/FDM/UIUCModel/uiuc_recorder.cpp b/src/FDM/UIUCModel/uiuc_recorder.cpp index 91329fa4e..98017e8d4 100644 --- a/src/FDM/UIUCModel/uiuc_recorder.cpp +++ b/src/FDM/UIUCModel/uiuc_recorder.cpp @@ -72,7 +72,7 @@ #include "uiuc_recorder.h" -FG_USING_STD(endl); // -dw +SG_USING_STD(endl); // -dw void uiuc_recorder( double dt ) { diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp index f17974559..7f9c9a342 100644 --- a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp +++ b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp @@ -78,11 +78,11 @@ for information. #include "uiuc_warnings_errors.h" -FG_USING_STD (cerr); -FG_USING_STD (endl); +SG_USING_STD (cerr); +SG_USING_STD (endl); #ifndef _MSC_VER -FG_USING_STD (exit); +SG_USING_STD (exit); #endif void uiuc_warnings_errors(int errorCode, string line) diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.h b/src/FDM/UIUCModel/uiuc_warnings_errors.h index 8248c00f2..88823fc8c 100644 --- a/src/FDM/UIUCModel/uiuc_warnings_errors.h +++ b/src/FDM/UIUCModel/uiuc_warnings_errors.h @@ -6,7 +6,7 @@ #include #include -FG_USING_STD(string); +SG_USING_STD(string); void uiuc_warnings_errors(int errorCode, string line); diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp index 52a1e3d44..9648e35df 100644 --- a/src/FDM/UIUCModel/uiuc_wrapper.cpp +++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp @@ -75,8 +75,8 @@ #include "uiuc_betaprobe.h" #include -FG_USING_STD(cout); -FG_USING_STD(endl); +SG_USING_STD(cout); +SG_USING_STD(endl); extern "C" void uiuc_init_aeromodel (); extern "C" void uiuc_force_moment(double dt); diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx index 47aa735c6..da905abb0 100644 --- a/src/FDM/flight.hxx +++ b/src/FDM/flight.hxx @@ -94,9 +94,9 @@ #include
-FG_USING_STD(list); -FG_USING_STD(vector); -FG_USING_STD(string); +SG_USING_STD(list); +SG_USING_STD(vector); +SG_USING_STD(string); typedef double FG_VECTOR_3[3]; diff --git a/src/FDM/ps-10520c.cxx b/src/FDM/ps-10520c.cxx index 44c06c8f7..fc198697e 100644 --- a/src/FDM/ps-10520c.cxx +++ b/src/FDM/ps-10520c.cxx @@ -54,8 +54,8 @@ #include #include -FG_USING_STD(cout); -FG_USING_STD(endl); +SG_USING_STD(cout); +SG_USING_STD(endl); // ------------------------------------------------------------------------ // CODE diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx index 2019f7071..149420a16 100644 --- a/src/GUI/gui.cxx +++ b/src/GUI/gui.cxx @@ -86,10 +86,10 @@ #include "net_dlg.hxx" #include "sgVec3Slider.hxx" -FG_USING_STD(string); +SG_USING_STD(string); -#ifndef FG_HAVE_NATIVE_SGI_COMPILERS -FG_USING_STD(cout); +#ifndef SG_HAVE_NATIVE_SGI_COMPILERS +SG_USING_STD(cout); #endif // main.cxx hack, should come from an include someplace diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx index 2b1eb0a72..3feca5e61 100644 --- a/src/GUI/mouse.cxx +++ b/src/GUI/mouse.cxx @@ -78,10 +78,10 @@ #include "gui.h" #include "gui_local.hxx" -FG_USING_STD(string); +SG_USING_STD(string); -#ifndef FG_HAVE_NATIVE_SGI_COMPILERS -FG_USING_STD(cout); +#ifndef SG_HAVE_NATIVE_SGI_COMPILERS +SG_USING_STD(cout); #endif /* -------------------------------------------------------------------- diff --git a/src/Include/auto_ptr.hxx b/src/Include/auto_ptr.hxx index 732129227..3ed71b72a 100644 --- a/src/Include/auto_ptr.hxx +++ b/src/Include/auto_ptr.hxx @@ -45,7 +45,7 @@ public: a.owns = 0; } -#ifdef _FG_MEMBER_TEMPLATES +#ifdef _SG_MEMBER_TEMPLATES template auto_ptr(const auto_ptr& a) : ptr(a.ptr), owns(a.owns) { a.owns = 0; @@ -62,7 +62,7 @@ public: } } -#ifdef _FG_MEMBER_TEMPLATES +#ifdef _SG_MEMBER_TEMPLATES template auto_ptr& operator = (const auto_ptr& a) { if (&a != this) { if (owns) diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx index 1f952a149..303fcb6e6 100644 --- a/src/Joystick/joystick.cxx +++ b/src/Joystick/joystick.cxx @@ -42,8 +42,8 @@ #include "joystick.hxx" -FG_USING_STD(string); -FG_USING_STD(cout); +SG_USING_STD(string); +SG_USING_STD(cout); #ifdef WIN32 static const int MAX_JOYSTICKS = 2; diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx index 6083b288a..ac2810275 100644 --- a/src/Main/bfi.cxx +++ b/src/Main/bfi.cxx @@ -52,7 +52,7 @@ #include "fg_init.hxx" #include "fg_props.hxx" -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); #include "bfi.hxx" diff --git a/src/Main/bfi.hxx b/src/Main/bfi.hxx index bdff783cb..ac250b24d 100644 --- a/src/Main/bfi.hxx +++ b/src/Main/bfi.hxx @@ -27,7 +27,7 @@ #include -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); /** diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index 473bf56ef..41f886e25 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -107,7 +107,7 @@ #include #endif -FG_USING_STD(string); +SG_USING_STD(string); extern const char *default_root; diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx index 2a7afcfbe..6c9e5e8cb 100644 --- a/src/Main/fg_io.cxx +++ b/src/Main/fg_io.cxx @@ -46,7 +46,7 @@ #include "globals.hxx" -FG_USING_STD(string); +SG_USING_STD(string); // define the global I/O channel list diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx index 06155b7bc..48169748c 100644 --- a/src/Main/globals.hxx +++ b/src/Main/globals.hxx @@ -39,8 +39,8 @@ #include #include "viewmgr.hxx" -FG_USING_STD( vector ); -FG_USING_STD( string ); +SG_USING_STD( vector ); +SG_USING_STD( string ); typedef vector string_list; diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 636db9029..299e1e06a 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -55,8 +55,8 @@ bool global_fullscreen = true; #include "fg_props.hxx" #include "options.hxx" -FG_USING_STD(string); -FG_USING_NAMESPACE(std); +SG_USING_STD(string); +SG_USING_NAMESPACE(std); #define NEW_DEFAULT_MODEL_HZ 120 diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx index 74027004a..9969fae5f 100644 --- a/src/Main/viewmgr.hxx +++ b/src/Main/viewmgr.hxx @@ -41,7 +41,7 @@ #include "viewer_lookat.hxx" #include "viewer_rph.hxx" -FG_USING_STD(vector); +SG_USING_STD(vector); // Define a structure containing view information diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx index 0915cedb8..3f2e50083 100644 --- a/src/Navaids/fix.hxx +++ b/src/Navaids/fix.hxx @@ -30,7 +30,7 @@ #ifdef SG_HAVE_STD_INCLUDES # include -#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #elif defined( __BORLANDC__ ) # include @@ -38,12 +38,12 @@ # include #endif -#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) -FG_USING_STD(istream); +#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS ) +SG_USING_STD(istream); #endif #include STL_STRING -FG_USING_STD(string); +SG_USING_STD(string); class FGFix { diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx index 968e90faf..9a99efcfd 100644 --- a/src/Navaids/fixlist.hxx +++ b/src/Navaids/fixlist.hxx @@ -34,9 +34,9 @@ #include "fix.hxx" -FG_USING_STD(map); -FG_USING_STD(vector); -FG_USING_STD(string); +SG_USING_STD(map); +SG_USING_STD(vector); +SG_USING_STD(string); class FGFixList { diff --git a/src/Navaids/ils.hxx b/src/Navaids/ils.hxx index 8fe322596..a94d8ceb0 100644 --- a/src/Navaids/ils.hxx +++ b/src/Navaids/ils.hxx @@ -31,7 +31,7 @@ #ifdef SG_HAVE_STD_INCLUDES # include -#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #elif defined( __BORLANDC__ ) # include @@ -39,8 +39,8 @@ # include #endif -#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) -FG_USING_STD(istream); +#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS ) +SG_USING_STD(istream); #endif diff --git a/src/Navaids/ilslist.hxx b/src/Navaids/ilslist.hxx index 913fc0c28..433e975f3 100644 --- a/src/Navaids/ilslist.hxx +++ b/src/Navaids/ilslist.hxx @@ -33,8 +33,8 @@ #include "ils.hxx" -FG_USING_STD(map); -FG_USING_STD(vector); +SG_USING_STD(map); +SG_USING_STD(vector); class FGILSList { diff --git a/src/Navaids/mkrbeacons.hxx b/src/Navaids/mkrbeacons.hxx index fc8b62b1b..c24977d32 100644 --- a/src/Navaids/mkrbeacons.hxx +++ b/src/Navaids/mkrbeacons.hxx @@ -33,8 +33,8 @@ #include "nav.hxx" -FG_USING_STD(map); -FG_USING_STD(vector); +SG_USING_STD(map); +SG_USING_STD(vector); class FGBeacon { diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx index bdd83ca2e..d939e2d01 100644 --- a/src/Navaids/nav.hxx +++ b/src/Navaids/nav.hxx @@ -34,7 +34,7 @@ #ifdef SG_HAVE_STD_INCLUDES # include -#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #elif defined( __BORLANDC__ ) # include @@ -42,8 +42,8 @@ # include #endif -#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS ) -FG_USING_STD(istream); +#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS ) +SG_USING_STD(istream); #endif diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx index 44ecb5446..9423537ab 100644 --- a/src/Navaids/navlist.hxx +++ b/src/Navaids/navlist.hxx @@ -33,8 +33,8 @@ #include "nav.hxx" -FG_USING_STD(map); -FG_USING_STD(vector); +SG_USING_STD(map); +SG_USING_STD(vector); class FGNavList { diff --git a/src/Network/atlas.hxx b/src/Network/atlas.hxx index 598ab7b17..0d76d3098 100644 --- a/src/Network/atlas.hxx +++ b/src/Network/atlas.hxx @@ -31,7 +31,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGAtlas : public FGProtocol { diff --git a/src/Network/garmin.hxx b/src/Network/garmin.hxx index ee50834de..5e2db9416 100644 --- a/src/Network/garmin.hxx +++ b/src/Network/garmin.hxx @@ -31,7 +31,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGGarmin : public FGProtocol { diff --git a/src/Network/joyclient.hxx b/src/Network/joyclient.hxx index 22c6f9e3e..f28d74ad9 100644 --- a/src/Network/joyclient.hxx +++ b/src/Network/joyclient.hxx @@ -33,7 +33,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGJoyClient : public FGProtocol { diff --git a/src/Network/native.hxx b/src/Network/native.hxx index 2c6be68dc..703438a2a 100644 --- a/src/Network/native.hxx +++ b/src/Network/native.hxx @@ -33,7 +33,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGNative : public FGProtocol { diff --git a/src/Network/nmea.hxx b/src/Network/nmea.hxx index 142809ec5..094a87899 100644 --- a/src/Network/nmea.hxx +++ b/src/Network/nmea.hxx @@ -31,7 +31,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGNMEA : public FGProtocol { diff --git a/src/Network/props.cxx b/src/Network/props.cxx index e82d8a10c..1a42c8d62 100644 --- a/src/Network/props.cxx +++ b/src/Network/props.cxx @@ -35,8 +35,8 @@ #include "props.hxx" -FG_USING_STD(cout); -FG_USING_STD(istrstream); +SG_USING_STD(cout); +SG_USING_STD(istrstream); FGProps::FGProps() { } diff --git a/src/Network/props.hxx b/src/Network/props.hxx index bd173bf05..aa349582a 100644 --- a/src/Network/props.hxx +++ b/src/Network/props.hxx @@ -32,7 +32,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); const static int max_cmd_len = 256; diff --git a/src/Network/protocol.hxx b/src/Network/protocol.hxx index 0417d1860..8c6535b52 100644 --- a/src/Network/protocol.hxx +++ b/src/Network/protocol.hxx @@ -30,8 +30,8 @@ #include STL_STRING #include -FG_USING_STD(string); -FG_USING_STD(vector); +SG_USING_STD(string); +SG_USING_STD(vector); #define FG_MAX_MSG_SIZE 16384 diff --git a/src/Network/pve.hxx b/src/Network/pve.hxx index f923c241d..455f0b184 100644 --- a/src/Network/pve.hxx +++ b/src/Network/pve.hxx @@ -31,7 +31,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGPVE : public FGProtocol { diff --git a/src/Network/ray.hxx b/src/Network/ray.hxx index 2de08544c..ce15583df 100644 --- a/src/Network/ray.hxx +++ b/src/Network/ray.hxx @@ -33,7 +33,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGRAY : public FGProtocol { diff --git a/src/Network/rul.hxx b/src/Network/rul.hxx index 8db5bfba9..c2f68441a 100644 --- a/src/Network/rul.hxx +++ b/src/Network/rul.hxx @@ -32,7 +32,7 @@ #include "protocol.hxx" -FG_USING_STD(string); +SG_USING_STD(string); class FGRUL : public FGProtocol { diff --git a/src/NetworkOLK/features.cxx b/src/NetworkOLK/features.cxx index 1901a298b..bc1df0b1a 100644 --- a/src/NetworkOLK/features.cxx +++ b/src/NetworkOLK/features.cxx @@ -23,7 +23,7 @@ # include #endif -#if defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +#if defined( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #else # include @@ -31,7 +31,7 @@ #include -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); #include "features.hxx" diff --git a/src/NetworkOLK/features.hxx b/src/NetworkOLK/features.hxx index f4c3204e5..fea526e38 100644 --- a/src/NetworkOLK/features.hxx +++ b/src/NetworkOLK/features.hxx @@ -34,7 +34,7 @@ #include #include STL_STRING -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); /* diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx index 69f9c2b5a..7c231d14d 100644 --- a/src/Objects/matlib.cxx +++ b/src/Objects/matlib.cxx @@ -52,7 +52,7 @@ #include "matlib.hxx" -FG_USING_STD(string); +SG_USING_STD(string); // global material management class diff --git a/src/Objects/matlib.hxx b/src/Objects/matlib.hxx index 3b2caf2e2..ad9ef450a 100644 --- a/src/Objects/matlib.hxx +++ b/src/Objects/matlib.hxx @@ -51,10 +51,10 @@ #include "newmat.hxx" -FG_USING_STD(string); -FG_USING_STD(map); -FG_USING_STD(vector); -FG_USING_STD(less); +SG_USING_STD(string); +SG_USING_STD(map); +SG_USING_STD(vector); +SG_USING_STD(less); // Material management class diff --git a/src/Objects/newmat.hxx b/src/Objects/newmat.hxx index f8cb93cc9..43a640ef6 100644 --- a/src/Objects/newmat.hxx +++ b/src/Objects/newmat.hxx @@ -46,7 +46,7 @@ #include STL_STRING // Standard C++ string library -FG_USING_STD(string); +SG_USING_STD(string); // MSVC++ 6.0 kuldge - Need forward declaration of friends. diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx index a2922c8fa..5f467ca6f 100644 --- a/src/Objects/obj.cxx +++ b/src/Objects/obj.cxx @@ -57,8 +57,8 @@ #include "matlib.hxx" #include "obj.hxx" -FG_USING_STD(string); -FG_USING_STD(vector); +SG_USING_STD(string); +SG_USING_STD(vector); typedef vector < int > int_list; diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx index 7191638d3..13c5fef10 100644 --- a/src/Objects/obj.hxx +++ b/src/Objects/obj.hxx @@ -48,7 +48,7 @@ #include -FG_USING_STD(string); +SG_USING_STD(string); // duplicated from the TerraGear tools diff --git a/src/Scenery/hitlist.hxx b/src/Scenery/hitlist.hxx index 3a4da70a1..0fa5d7465 100644 --- a/src/Scenery/hitlist.hxx +++ b/src/Scenery/hitlist.hxx @@ -11,7 +11,7 @@ #include -FG_USING_STD(vector); +SG_USING_STD(vector); class FGHitRec { diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx index 31f5adf52..c0e64720d 100644 --- a/src/Scenery/newcache.cxx +++ b/src/Scenery/newcache.cxx @@ -51,7 +51,7 @@ #include "tileentry.hxx" #include "tilemgr.hxx" // temp, need to delete later -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); // a cheesy hack (to be fixed later) extern ssgBranch *terrain; diff --git a/src/Scenery/newcache.hxx b/src/Scenery/newcache.hxx index 68632a237..c86a087fb 100644 --- a/src/Scenery/newcache.hxx +++ b/src/Scenery/newcache.hxx @@ -47,7 +47,7 @@ #include "tileentry.hxx" -FG_USING_STD(map); +SG_USING_STD(map); typedef map < long, FGTileEntry * > tile_map; diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx index 70139a3db..9980cb36c 100644 --- a/src/Scenery/tileentry.cxx +++ b/src/Scenery/tileentry.cxx @@ -41,8 +41,8 @@ #include "tileentry.hxx" -FG_USING_STD(for_each); -FG_USING_STD(mem_fun_ref); +SG_USING_STD(for_each); +SG_USING_STD(mem_fun_ref); // Constructor diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx index dbbf8a42e..446ac9855 100644 --- a/src/Scenery/tileentry.hxx +++ b/src/Scenery/tileentry.hxx @@ -54,8 +54,8 @@ #include #endif -FG_USING_STD(string); -FG_USING_STD(vector); +SG_USING_STD(string); +SG_USING_STD(vector); typedef vector < Point3D > point_list; diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx index 05d6748a8..49d7135a6 100644 --- a/src/Scenery/tilemgr.hxx +++ b/src/Scenery/tilemgr.hxx @@ -39,7 +39,7 @@ #include "hitlist.hxx" -FG_USING_STD(list); +SG_USING_STD(list); #if defined(USE_MEM) || defined(WIN32) diff --git a/src/Sound/soundmgr.hxx b/src/Sound/soundmgr.hxx index 547b467bc..3beb06949 100644 --- a/src/Sound/soundmgr.hxx +++ b/src/Sound/soundmgr.hxx @@ -39,8 +39,8 @@ #include #include -FG_USING_STD(map); -FG_USING_STD(string); +SG_USING_STD(map); +SG_USING_STD(string); // manages everything we need to know for an individual sound sample diff --git a/src/Time/event.cxx b/src/Time/event.cxx index 6d0790198..3d693c639 100644 --- a/src/Time/event.cxx +++ b/src/Time/event.cxx @@ -57,9 +57,9 @@ #include "event.hxx" -FG_USING_STD(for_each); -FG_USING_STD(mem_fun); -FG_USING_STD(string); +SG_USING_STD(for_each); +SG_USING_STD(mem_fun); +SG_USING_STD(string); fgEVENT_MGR global_events; diff --git a/src/Time/event.hxx b/src/Time/event.hxx index 2d5cf3945..067876fc9 100644 --- a/src/Time/event.hxx +++ b/src/Time/event.hxx @@ -40,9 +40,9 @@ #include STL_STRING -FG_USING_STD(deque); -FG_USING_STD(list); -FG_USING_STD(string); +SG_USING_STD(deque); +SG_USING_STD(list); +SG_USING_STD(string); class fgEVENT diff --git a/src/Time/light.cxx b/src/Time/light.cxx index 57aaeaca2..e9917a8ff 100644 --- a/src/Time/light.cxx +++ b/src/Time/light.cxx @@ -46,7 +46,7 @@ #endif #include -FG_USING_STD(string); +SG_USING_STD(string); #include #include diff --git a/src/Time/moonpos.hxx b/src/Time/moonpos.hxx index 50120350c..8551afebd 100644 --- a/src/Time/moonpos.hxx +++ b/src/Time/moonpos.hxx @@ -49,7 +49,7 @@ #ifdef SG_HAVE_STD_INCLUDES # include # ifdef macintosh - FG_USING_STD(time_t); + SG_USING_STD(time_t); # endif #else # include diff --git a/src/Time/sunpos.cxx b/src/Time/sunpos.cxx index 945f8d396..05c6eac8f 100644 --- a/src/Time/sunpos.cxx +++ b/src/Time/sunpos.cxx @@ -45,7 +45,7 @@ # include # include # ifdef macintosh - FG_USING_STD(time_t); + SG_USING_STD(time_t); # endif #else # include diff --git a/src/WeatherCM/FGLocalWeatherDatabase.h b/src/WeatherCM/FGLocalWeatherDatabase.h index 96e72453f..a779a861a 100644 --- a/src/WeatherCM/FGLocalWeatherDatabase.h +++ b/src/WeatherCM/FGLocalWeatherDatabase.h @@ -71,9 +71,9 @@ HISTORY /****************************************************************************/ /* DEFINES */ /****************************************************************************/ -FG_USING_STD(vector); -FG_USING_STD(string); -FG_USING_NAMESPACE(std); +SG_USING_STD(vector); +SG_USING_STD(string); +SG_USING_NAMESPACE(std); /****************************************************************************/ /* CLASS DECLARATION */ diff --git a/src/WeatherCM/FGPhysicalProperties.h b/src/WeatherCM/FGPhysicalProperties.h index d93796e11..1e20e35ce 100644 --- a/src/WeatherCM/FGPhysicalProperties.h +++ b/src/WeatherCM/FGPhysicalProperties.h @@ -78,9 +78,9 @@ HISTORY #include "FGCloudItem.h" #include "FGSnowRain.h" -FG_USING_STD(vector); -FG_USING_STD(map); -FG_USING_NAMESPACE(std); +SG_USING_STD(vector); +SG_USING_STD(map); +SG_USING_NAMESPACE(std); /****************************************************************************/ /* FOREWARD DEFINITIONS */ diff --git a/src/WeatherCM/FGPhysicalProperty.h b/src/WeatherCM/FGPhysicalProperty.h index cdafea250..23689b647 100644 --- a/src/WeatherCM/FGPhysicalProperty.h +++ b/src/WeatherCM/FGPhysicalProperty.h @@ -67,8 +67,8 @@ HISTORY #include "FGWeatherDefs.h" #include "FGPhysicalProperties.h" -FG_USING_STD(vector); -FG_USING_NAMESPACE(std); +SG_USING_STD(vector); +SG_USING_NAMESPACE(std); /****************************************************************************/ /* used for output: */ diff --git a/src/WeatherCM/FGWeatherParse.h b/src/WeatherCM/FGWeatherParse.h index 56717d3f6..5cbc0fd93 100644 --- a/src/WeatherCM/FGWeatherParse.h +++ b/src/WeatherCM/FGWeatherParse.h @@ -71,7 +71,7 @@ HISTORY /****************************************************************************/ /* DEFINES */ /****************************************************************************/ -FG_USING_STD(vector); +SG_USING_STD(vector); /****************************************************************************/ /* CLASS DECLARATION */