FG_ to SG_ namespace changes.

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index df1c42c74ef9a9c509c8bfd2b3f4787d8eef568c..31d3ad3044d3fa739fe17c9d205a709a4e81c0e3 100644 (file)
--- 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 4b6e5e3d131ffda22a196fb72e1cd993ccfb8dbd..2d67b96e4a2c7e83dba535d6b4cd135eee211968 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -38,7 +38,7 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #elif defined( __BORLANDC__ )
 #  include <iostream>
@@ -54,11 +54,11 @@
 #include <mk4str.h>
 #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 d2d758d2a4703f7035655cf342d2a89a6927e7ee..381b4fc8308366a01fadd857a8c9a1495fd9159c 100644 (file)
--- 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 1486a5136b06a35a18525ffac997977bb60ed8ce..05d11101f1b0b762f88793b6d14b60fa332c3158 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -40,7 +40,7 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #elif defined( __BORLANDC__ )
 #  include <iostream>
@@ -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 9892a5ef4b3dc2f08c62e87cfc59bf3e62b5db24..6b7e490d8192b992556bbceab511c34868ee7c0b 100644 (file)
--- a/src/Autopilot/auto_gui.hxx
+++ b/src/Autopilot/auto_gui.hxx
@@ -35,7 +35,7 @@
 #include <FDM/flight.hxx>
 #include <Controls/controls.hxx>
                        
-FG_USING_STD(string);
+SG_USING_STD(string);
 
                   
 // Defines

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index c7a7d1f663a892ebef15431d0ba511a5a50fac07..7498394394bd3c465311e02c56620dc3ebbdf64c 100644 (file)
--- 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 1adc9e811569859c14e7cdf5e909cea6bfed5f24..d0a3820b9d147f154e023b4eac75748d67550002 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -49,8 +49,8 @@
 #include <Main/fgfs.hxx>
 
 
-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 0e395a31c08a2cf29a49739f81dd16eaf15ad733..1f63b31f183db07d1b80fc68e84df09fddb9ab28 100644 (file)
--- 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);
 
 
 \f

diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx
index 5d0d56c08900909b76f3264ae9238dfdd1e306bf..0f203dfc0c51f13059e5f32a692098fd178c14f8 100644 (file)
--- 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 00e82c1c52cf5168fe9f7f4fe83d503c243c040e..57be7d7aa8da616a2de51793ac8f66ef54fe1d1a 100644 (file)
--- a/src/Cockpit/steam.cxx
+++ b/src/Cockpit/steam.cxx
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#if defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#if defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #else
 #  include <iostream>
@@ -36,7 +36,7 @@
 #include <Main/bfi.hxx>
 #include <NetworkOLK/features.hxx>
 
-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 b2ffda9ff6634b8f517cba93f3b107f468ebba97..c532344fc2e76a7f2d76e35f27a77c1f60bfb9f1 100644 (file)
--- a/src/Cockpit/steam.hxx
+++ b/src/Cockpit/steam.hxx
@@ -34,7 +34,7 @@
 #include <time.h>
 #include STL_STRING
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 
 /**

diff --git a/src/FDM/10520d.cxx b/src/FDM/10520d.cxx
index 472ab79a2ad749d9a5fb3e801476089b873de74c..a7a59ee946ce537832685a1e18e2061b2d0b7bc7 100644 (file)
--- 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 f0188a75d2e02c530be7a3ee7e94acd0e9dbc767..5a99294bd27b4fb25c37664ea8122f4d6623f748 100644 (file)
--- 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 5d040b055bd6b47da444766fbba3703f13e4f108..de40ec730f7ada0db40c17e9d63137927ee7d583 100644 (file)
--- a/src/FDM/IO360.hxx
+++ b/src/FDM/IO360.hxx
@@ -56,7 +56,7 @@
 #include <fstream>
 #include <math.h>
 
-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 e2f405fa9c7182e563a2d702481a3b7aff9b68f9..8c86c2d85e6b3a08f1236f9a4e214d1523189215 100644 (file)
--- a/src/FDM/JSBSim/FGEngine.h
+++ b/src/FDM/JSBSim/FGEngine.h
@@ -47,7 +47,7 @@ INCLUDES
 #ifdef FGFS
 #  include <simgear/compiler.h>
 #  include STL_STRING
-FG_USING_STD(string);
+SG_USING_STD(string);
 #else
 #  include <string>
 #endif

diff --git a/src/FDM/LaRCsimIC.cxx b/src/FDM/LaRCsimIC.cxx
index e525b43332d28f6f2a0ebfe4b4da54312a538495..69af5ecdd031c35e749c86d06d4c7db497d8e630 100644 (file)
--- a/src/FDM/LaRCsimIC.cxx
+++ b/src/FDM/LaRCsimIC.cxx
@@ -38,8 +38,8 @@
 #include <FDM/LaRCsim/ls_constants.h>
 #include <FDM/LaRCsim/ls_geodesy.h>
 
-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 f566933a896ff1080eabd40c66deda6c4f1ca2cd..c129fd2cd0b2f2af06791869805e5fb23ef39510 100644 (file)
--- 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 dea205d92adffe0e8bb2d967cbb6590fc6ddf808..56b7e9473773b6d674fcf2052da1e64b85808475 100644 (file)
--- 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 d2a5b601bbf38aeb5868cc26b5c1e0eb82ba46c7..d6895db9f5bec94a9dbdd43f9b1b38742ca3f65d 100644 (file)
--- 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 49e23ab396bc6d73693122f1fbf152905c4fbb25..7511338d387269dacf078e6137d04159a7523681 100644 (file)
--- 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 5a0ac08af15f7531b5c995d860b4c82c5304349a..0989208803d5b7e892a861882eaf770f895dbc7c 100644 (file)
--- 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 d0dc09040a4099f5e6ea71f4957c0ed8f5192ed0..20fb8ae57a4aa9b82c382f3ebffa53fff547b27e 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_parsefile.h
+++ b/src/FDM/UIUCModel/uiuc_parsefile.h
@@ -7,10 +7,10 @@
 #include <list>
 #include <fstream>
 
-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 91329fa4e0da0c32937ff1110b2286bbaf8bf94c..98017e8d47f602756d6d614ea3513cc293e79963 100644 (file)
--- 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 f179745599deedb1d7273d28d54f29c206e76306..7f9c9a3427dfb75ceb1c465141f720ae6cea502f 100644 (file)
--- 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 8248c00f263de939b50764789af24e5169d1516b..88823fc8cd3841660423077c7ef17678d8f75425 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.h
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <iostream>
 
-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 52a1e3d441877d3dddd9b58d942d17a9f6d1b49f..9648e35dfcbcbd925515b35deaadb0f6b1309bbe 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -75,8 +75,8 @@
 #include "uiuc_betaprobe.h"
 #include <FDM/LaRCsim/ls_generic.h>
 
-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 47aa735c6bdb802b21dc3d4147da6cff92d91708..da905abb0f14b2e9d792111a73ab96901c336620 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -94,9 +94,9 @@
 
 #include <Main/fgfs.hxx>
 
-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 44c06c8f72912fe4c3936fe5d6cb0b3d7eef6a02..fc198697e63975fe2b26fc78daed701c85aeb9cd 100644 (file)
--- a/src/FDM/ps-10520c.cxx
+++ b/src/FDM/ps-10520c.cxx
@@ -54,8 +54,8 @@
 #include <iostream>
 #include <math.h>
 
-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 2019f70717a36a764c3b0ade0c75c28113b6bdc8..149420a16bd879ca8650352f3b08cf107b52bf1e 100644 (file)
--- 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 2b1eb0a72dcd9bc936fa1b695bafeb71d0de8c8f..3feca5e61a2a32ae318e06009956e01e717fc8f9 100644 (file)
--- 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 732129227d40756ed4ba663728e2f0352cdddc13..3ed71b72a6a4a4699fa3f213a34052badd9cdf05 100644 (file)
--- 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 <class T> auto_ptr(const auto_ptr<T>& a)
        : ptr(a.ptr), owns(a.owns) {
        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) {
        if (&a != this) {
            if (owns)

diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx
index 1f952a149e5380a42e91246b8b4e8313ebf91589..303fcb6e61a425c6fb36960d57ee2865e5328ff8 100644 (file)
--- 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 6083b288a50306f2df288baca32aefb9d65a589e..ac28102750bf29c4e024e59ab9c1396c6dc3ca61 100644 (file)
--- 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 bdff783cb602014f14318ce2f31e3784c4683bd7..ac250b24d83a53a52ccd19824fba634ed5df6335 100644 (file)
--- a/src/Main/bfi.hxx
+++ b/src/Main/bfi.hxx
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 
 /**

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 473bf56ef16805cb429cd97f443066a54c6e04b7..41f886e25688cea0b830e697d831ad8cacb60b4b 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -107,7 +107,7 @@
 #include <GL/xmesa.h>
 #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 2a7afcfbe7dda2e61e5d508aa9937a75af76ee27..6c9e5e8cbdc2e4376cf5b81e7fe601eff94e7825 100644 (file)
--- 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 06155b7bc1c856f5377afe704f538c2fae3cf487..48169748c8d049d83add083f82d78eece81c24a4 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -39,8 +39,8 @@
 #include <Sound/soundmgr.hxx>
 #include "viewmgr.hxx"
 
-FG_USING_STD( vector );
-FG_USING_STD( string );
+SG_USING_STD( vector );
+SG_USING_STD( string );
 
 typedef vector<string> string_list;
 

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 636db9029bc51100c98d780a729f3014a269b6e7..299e1e06ad03ac469093041153e1c2d5b3dac30e 100644 (file)
--- 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 74027004a3215cacf0567aeec960428183378f69..9969fae5f1b14e7f7fbf9ee4b7460017521cd382 100644 (file)
--- 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 0915cedb84a05a431bf9f37c32730c1c2cdcf478..3f2e50083d8259c93ca75750bcc4e5abc886c0be 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -30,7 +30,7 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #elif defined( __BORLANDC__ )
 #  include <iostream>
@@ -38,12 +38,12 @@
 #  include <istream.h>
 #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 968e90faf32de0c489355cdb01414fe269bcb2d9..9a99efcfd4a38c3d9c5334ec17721fd236b61b53 100644 (file)
--- 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 8fe322596452171c4eed6888a4911d474ccc606f..a94d8ceb07b05eb1a1bb273f80c46b65d2c35682 100644 (file)
--- a/src/Navaids/ils.hxx
+++ b/src/Navaids/ils.hxx
@@ -31,7 +31,7 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #elif defined( __BORLANDC__ )
 #  include <iostream>
@@ -39,8 +39,8 @@
 #  include <istream.h>
 #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 913fc0c28212b9911d91aaeb1ba0b2f2a8badf88..433e975f3fec79e5581af03b38b62027bf9fc54b 100644 (file)
--- 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 fc8b62b1b9ce176a13d595332327ff5a6c67740a..c24977d3255cd35d52279abfc035576268067cd4 100644 (file)
--- 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 bdd83ca2e202039110d057e4eff65b711d40f734..d939e2d013b54e807baeaba8ab4a4658804cf07b 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -34,7 +34,7 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #elif defined( __BORLANDC__ )
 #  include <iostream>
@@ -42,8 +42,8 @@
 #  include <istream.h>
 #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 44ecb544690cea074bc2d379b9fb5c922dadf71b..9423537abd4c815d4b5f17dce4d62d2ea532eee2 100644 (file)
--- 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 598ab7b17c43d3c8a0fce9c1f88c670e1b35a231..0d76d3098317ebd59252965010f812c142961ea5 100644 (file)
--- 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 ee50834de8200ae99e0872e431682b74ed91ff59..5e2db9416ad4406368501cc520d238c5149b6d05 100644 (file)
--- 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 22c6f9e3ec023199f4a606cba5e74b4807edc567..f28d74ad92ae3e6a3a7eb7ff6d4297730dfd6dff 100644 (file)
--- 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 2c6be68dc6f18517d0f7e38f7fc80b48e348dc5d..703438a2a9e28fbe6cc523752a8abfcf2c1f1e21 100644 (file)
--- 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 142809ec5bf35c5d2a795b33daab84b01cdee235..094a878997d8e3a3916793f708dd1a5c0a8d9d20 100644 (file)
--- 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 e82d8a10c44862b6d5134272b6bb6bd9523512c1..1a42c8d62f536f03c7ea64b815c92222efa53f20 100644 (file)
--- 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 bd173bf0500d0bd051c802716ad00e0ac6a88b66..aa349582a34bd1b1266fd2629b7db23b4594845f 100644 (file)
--- 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 0417d1860bd7f91f031411f5e101f14b6f820692..8c6535b520448d5bfe14c8832265595336616801 100644 (file)
--- a/src/Network/protocol.hxx
+++ b/src/Network/protocol.hxx
@@ -30,8 +30,8 @@
 #include STL_STRING
 #include <vector>
 
-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 f923c241db5a5f2693907fdd8cf6969bda487c17..455f0b184295f673b9908a699d88b16fcad3b4d9 100644 (file)
--- 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 2de08544c7641529f8802e765599c4ac26728bbb..ce15583dfbb433a78f4ba15ae6835aeb575d9b86 100644 (file)
--- 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 8db5bfba98beae0864b20d93c2680292953c8abf..c2f68441a2a63485181e2a7d4c9210583f5b5590 100644 (file)
--- 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 1901a298b183b4e2b166a708b7319c490ad71364..bc1df0b1ae988d222d175a251f1f8b3315d6f168 100644 (file)
--- a/src/NetworkOLK/features.cxx
+++ b/src/NetworkOLK/features.cxx
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#if defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#if defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #else
 #  include <iostream>
@@ -31,7 +31,7 @@
 
 #include <simgear/math/sg_types.hxx>
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 #include "features.hxx"
 

diff --git a/src/NetworkOLK/features.hxx b/src/NetworkOLK/features.hxx
index f4c3204e541e2e6ed9cde5fd6c2622a11f143839..fea526e38524a01e75fb1b910e79b83552b1b165 100644 (file)
--- a/src/NetworkOLK/features.hxx
+++ b/src/NetworkOLK/features.hxx
@@ -34,7 +34,7 @@
 #include <time.h>
 #include STL_STRING
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 
 /*

diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx
index 69f9c2b5a363553609a853ab51e5d8c2627be86c..7c231d14d16a5a5863d424aa1189b8e3102727f5 100644 (file)
--- 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 3b2caf2e280bfebe150fe77b509e3f7bfd96e8df..ad9ef450aa7a0cc443c4a29ad04692a617f3b5b9 100644 (file)
--- 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 f8cb93cc9be801e1278416fce373ed80d61396d4..43a640ef6be1f9de093a49f599751c2ef59ea1e4 100644 (file)
--- 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 a2922c8faa41a05cead508fa07a201cda379d2bc..5f467ca6f73a833247f9889537a8d46086d7a1ef 100644 (file)
--- 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 7191638d3b6e40e47a2fa8ee33683befde12c64b..13c5fef10094750e8d1a6b95b656fc31cfe0a502 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -48,7 +48,7 @@
 
 #include <Scenery/tileentry.hxx>
 
-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 3a4da70a14bd3b8620c0253311042a56977440a1..0fa5d74651a2074f91f80c56770a8c0e90bdac2d 100644 (file)
--- a/src/Scenery/hitlist.hxx
+++ b/src/Scenery/hitlist.hxx
@@ -11,7 +11,7 @@
 
 #include <plib/ssg.h>
 
-FG_USING_STD(vector);
+SG_USING_STD(vector);
 
 
 class FGHitRec {

diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index 31f5adf526e757f91c28ecadc70576beb1c9927a..c0e64720d77d44fed32e4e434cf4e259cbcb3558 100644 (file)
--- 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 68632a2371ca1bbababb5e7f43aba959cdadad4f..c86a087fb9a076fb7a10a00361cd2bb90fb07580 100644 (file)
--- 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 70139a3db7d99ae356298e5de2a145388bb28883..9980cb36c4e9e676fd743b033b1e89b85ea81f50 100644 (file)
--- 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 dbbf8a42e135b41787753451ac4eb228993d8cde..446ac98558244560f0bbec67ba836c466074b381 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -54,8 +54,8 @@
 #include <strings.h>
 #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 05d6748a8d889e0889d6d6c9ba171abebc286b3b..49d7135a64b71f3042e0585d2839866144fc7b30 100644 (file)
--- 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 547b467bcb15c8708049ce1488692aa62b0660bf..3beb06949e3280c69f3b9429b244f6eaed2b42f6 100644 (file)
--- a/src/Sound/soundmgr.hxx
+++ b/src/Sound/soundmgr.hxx
@@ -39,8 +39,8 @@
 #include <plib/sl.h>
 #include <plib/sm.h>
 
-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 6d079019869288e903db99fb74512a2a495c06a0..3d693c639cfe8b840e50a9bf3a5921ee6be9ba17 100644 (file)
--- 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 2d5cf39450d6983b6fd8ca6865e4032cba06fd9d..067876fc9db220fb22ddd040547520645f8d2f32 100644 (file)
--- 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 57aaeaca200077ca86d5dd4ab0a240c9546c1006..e9917a8ffe0814d03c1431e5f5fd946ed266425b 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -46,7 +46,7 @@
 #endif
 
 #include <string>
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>

diff --git a/src/Time/moonpos.hxx b/src/Time/moonpos.hxx
index 50120350c5600a096ef0f7987ba32edc24eccdc5..8551afebd40e2bc6d350542ac4ff5eed36305881 100644 (file)
--- a/src/Time/moonpos.hxx
+++ b/src/Time/moonpos.hxx
@@ -49,7 +49,7 @@
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <ctime>
 #  ifdef macintosh
-     FG_USING_STD(time_t);
+     SG_USING_STD(time_t);
 #  endif
 #else
 #  include <time.h>

diff --git a/src/Time/sunpos.cxx b/src/Time/sunpos.cxx
index 945f8d396b7a11f84cb5586cd817f1ea9f06a866..05c6eac8f671648b1251add050381e906f5abd93 100644 (file)
--- a/src/Time/sunpos.cxx
+++ b/src/Time/sunpos.cxx
@@ -45,7 +45,7 @@
 #  include <cstdio>
 #  include <ctime>
 #  ifdef macintosh
-     FG_USING_STD(time_t);
+     SG_USING_STD(time_t);
 #  endif
 #else
 #  include <math.h>

diff --git a/src/WeatherCM/FGLocalWeatherDatabase.h b/src/WeatherCM/FGLocalWeatherDatabase.h
index 96e72453f6895c16419e065025985e2b894f10a6..a779a861a2366e735d6691673b4c3bf04c21f7ba 100644 (file)
--- 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 d93796e118bb650905fa7754bdaaad575ce0860d..1e20e35ce85dbd33ab6c319a993e80f0b29ddad7 100644 (file)
--- 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 cdafea250692f9e9a2bf8f24e466dddbc0e8f4d2..23689b6474446c5a8d0567980071a3fb57e619ec 100644 (file)
--- 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 56717d3f64ffe57977d1f342f9a10c88a1dc701e..5cbc0fd933ec407385a354369c2fd2260ec9cbd6 100644 (file)
--- 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                                                       */