FG_ to SG_ namespace changes.

diff --git a/simgear/bucket/newbucket.hxx b/simgear/bucket/newbucket.hxx
index dc48f87384d6c042f9634b6f49745f4e6772df71..1564987d476926851dd4582fd7184712b980a438 100644 (file)
--- a/simgear/bucket/newbucket.hxx
+++ b/simgear/bucket/newbucket.hxx
@@ -47,16 +47,16 @@
 // already depending on how you defined SG_HAVE_STD_INCLUDES, but I
 // can go ahead and add this -- CLO
 #ifdef __MWERKS__
-FG_USING_STD(sprintf);
-FG_USING_STD(fabs);
+SG_USING_STD(sprintf);
+SG_USING_STD(fabs);
 #endif
 
 #include STL_STRING
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(ostream);
+#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
+SG_USING_STD(ostream);
 #endif
 
 

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 3a877b0afb02886503681de375bcab32ffa34081..e77233e7331421dbe88bc7ceffd32cc59f8c4f07 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -93,7 +93,7 @@
        // g++-2.8.x and egcs-1.x
 #      define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #      define SG_NEED_AUTO_PTR
-#      define FG_MEMBER_TEMPLATES
+#      define SG_MEMBER_TEMPLATES
 #      define SG_NAMESPACES
 #      define SG_HAVE_STD
 #      define SG_HAVE_STREAMBUF
@@ -120,7 +120,7 @@
 #  define SG_NAMESPACES
 #  define SG_HAVE_STD
 #  define SG_HAVE_STREAMBUF
-#  define FG_HAVE_TRAITS
+#  define SG_HAVE_TRAITS
 #  define SG_HAVE_STD_INCLUDES
 
 #  define STL_ALGORITHM  <algorithm>
@@ -140,7 +140,7 @@
 /*
   CodeWarrior compiler from Metrowerks, Inc.
 */
-#  define FG_HAVE_TRAITS
+#  define SG_HAVE_TRAITS
 #  define SG_HAVE_STD_INCLUDES
 #  define SG_HAVE_STD
 #  define SG_NAMESPACES
@@ -250,15 +250,15 @@
 //
 
 #if defined ( sgi ) && !defined( __GNUC__ )
-#  define FG_HAVE_NATIVE_SGI_COMPILERS
+#  define SG_HAVE_NATIVE_SGI_COMPILERS
 
 #  define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #  define SG_NEED_AUTO_PTR
-#  define FG_MEMBER_TEMPLATES
+#  define SG_MEMBER_TEMPLATES
 #  define SG_NAMESPACES
 #  define SG_HAVE_STD
 #  define SG_CLASS_PARTIAL_SPECIALIZATION
-#  define FG_HAVE_TRAITS
+#  define SG_HAVE_TRAITS
 
 #  define STL_ALGORITHM  <algorithm>
 #  define STL_FUNCTIONAL <functional>
@@ -289,53 +289,53 @@
 // No user modifiable definitions beyond here.
 //
 
-#ifdef FG_NEED_EXPLICIT
+#ifdef SG_NEED_EXPLICIT
 #  define explicit
 #endif
 
-#ifdef FG_NEED_TYPENAME
+#ifdef SG_NEED_TYPENAME
 #  define typename
 #endif
 
-#ifdef FG_NEED_MUTABLE
+#ifdef SG_NEED_MUTABLE
 #  define mutable
 #endif
 
-#ifdef FG_NEED_BOOL
+#ifdef SG_NEED_BOOL
    typedef int bool;
 #  define true 1
 #  define false 0
 #endif
 
 #ifdef SG_EXPLICIT_FUNCTION_TMPL_ARGS
-#  define FG_NULL_TMPL_ARGS <>
+#  define SG_NULL_TMPL_ARGS <>
 #else
-#  define FG_NULL_TMPL_ARGS
+#  define SG_NULL_TMPL_ARGS
 #endif
 
 #ifdef SG_CLASS_PARTIAL_SPECIALIZATION
-# define FG_TEMPLATE_NULL template<>
+# define SG_TEMPLATE_NULL template<>
 #else
-# define FG_TEMPLATE_NULL
+# define SG_TEMPLATE_NULL
 #endif
 
-// FG_NO_NAMESPACES is a hook so that users can disable namespaces
+// SG_NO_NAMESPACES is a hook so that users can disable namespaces
 // without having to edit library headers.
-#if defined(SG_NAMESPACES) && !defined(FG_NO_NAMESPACES)
-#   define FG_NAMESPACE(X) namespace X {
-#   define FG_NAMESPACE_END }
-#   define FG_USING_NAMESPACE(X) using namespace X
+#if defined(SG_NAMESPACES) && !defined(SG_NO_NAMESPACES)
+#   define SG_NAMESPACE(X) namespace X {
+#   define SG_NAMESPACE_END }
+#   define SG_USING_NAMESPACE(X) using namespace X
 # else
-#   define FG_NAMESPACE(X)
-#   define FG_NAMESPACE_END
-#   define FG_USING_NAMESPACE(X)
+#   define SG_NAMESPACE(X)
+#   define SG_NAMESPACE_END
+#   define SG_USING_NAMESPACE(X)
 #endif
 
 # ifdef SG_HAVE_STD
-#  define FG_USING_STD(X) using std::X
+#  define SG_USING_STD(X) using std::X
 #  define STD std
 # else
-#  define FG_USING_STD(X) 
+#  define SG_USING_STD(X) 
 #  define STD
 # endif
 

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index fd1c878c77647064801fd946f00881941ffebf9b..d622d11712cd929ffd5646de128fa6755533e0a1 100644 (file)
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -32,7 +32,7 @@
 #include <simgear/compiler.h>
 
 // At least Irix needs this
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#ifdef SG_HAVE_NATIVE_SGI_COMPILERS
 #include <char_traits.h>
 #endif
 
@@ -46,17 +46,17 @@
 
 #include <simgear/debug/debug_types.h>
 
-#ifndef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_STD(streambuf);
-FG_USING_STD(ostream);
-FG_USING_STD(cerr);
-FG_USING_STD(endl);
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
+SG_USING_STD(streambuf);
+SG_USING_STD(ostream);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
 #else
-FG_USING_STD(char_traits);
+SG_USING_STD(char_traits);
 #endif
 
 #ifdef __MWERKS__
-FG_USING_STD(iostream);
+SG_USING_STD(iostream);
 #endif
 
 //

diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx
index f153b5272c591d0f958b59bf875e71fb6ef9b5aa..8f69356f5ef6866e944115531ba2529b1e96d88b 100644 (file)
--- a/simgear/ephemeris/stardata.cxx
+++ b/simgear/ephemeris/stardata.cxx
@@ -27,8 +27,8 @@
 
 #include "stardata.hxx"
 
-#if defined (_MSC_VER) || defined (FG_HAVE_NATIVE_SGI_COMPILERS)
-  FG_USING_STD(getline);
+#if defined (_MSC_VER) || defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+  SG_USING_STD(getline);
 #endif
 
 // Constructor

diff --git a/simgear/fg_traits.hxx b/simgear/fg_traits.hxx
index ad1084bfd3e2670ac3ed2fcf488a9cde171913b6..ed8c926acf9070b8db491db95ad594ecefb150c1 100644 (file)
--- a/simgear/fg_traits.hxx
+++ b/simgear/fg_traits.hxx
@@ -3,12 +3,12 @@
 
 #include <simgear/compiler.h>
 
-#ifndef FG_HAVE_TRAITS
+#ifndef SG_HAVE_TRAITS
 
 // Dummy up some char traits for now.
 template<class charT> struct char_traits{};
 
-FG_TEMPLATE_NULL
+SG_TEMPLATE_NULL
 struct char_traits<char>
 {
     typedef char      char_type;
@@ -18,6 +18,6 @@ struct char_traits<char>
 
     static int_type eof() { return EOF; }
 };
-#endif // FG_HAVE_TRAITS
+#endif // SG_HAVE_TRAITS
 
 #endif // _FG_TRAITS_HXX

diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx
index 1d324be218417e88ab3c47dc89f8439e67833fbe..1651c106f065bdb0325dd31e722f96254b14416f 100644 (file)
--- a/simgear/io/iochannel.hxx
+++ b/simgear/io/iochannel.hxx
@@ -32,8 +32,8 @@
 #include STL_STRING
 #include <vector>
 
-FG_USING_STD(vector);
-FG_USING_STD(string);
+SG_USING_STD(vector);
+SG_USING_STD(string);
 
 
 #define SG_IO_MAX_MSG_SIZE 16384

diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index 487ff9a1870b2d6c8a2cfd34e3765f7b37958358..03c1b2c286d0c99d2f0035d47b26bee21fb9d1bd 100644 (file)
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -40,12 +40,12 @@
 #include "sg_binobj.hxx"
 
 
-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( cout );
-FG_USING_STD( endl );
+#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD( cout );
+SG_USING_STD( endl );
 #endif
 
 

diff --git a/simgear/io/sg_file.cxx b/simgear/io/sg_file.cxx
index 912bcb6c3207b8a66fd6a3c17353276bca5fb8df..ed74027576fa1ee99ec7fb7eda80596ccc7ad9fe 100644 (file)
--- a/simgear/io/sg_file.cxx
+++ b/simgear/io/sg_file.cxx
@@ -33,7 +33,7 @@
 
 #include "sg_file.hxx"
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 SGFile::SGFile( const string &file) {

diff --git a/simgear/io/sg_file.hxx b/simgear/io/sg_file.hxx
index 00d47143dc6ef47fc534e03082aec5dc208bfbda..a0c35e6cd48a490733421e9f034d1a475636f038 100644 (file)
--- a/simgear/io/sg_file.hxx
+++ b/simgear/io/sg_file.hxx
@@ -42,7 +42,7 @@
 
 #include "iochannel.hxx"
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 class SGFile : public SGIOChannel {

diff --git a/simgear/io/sg_serial.cxx b/simgear/io/sg_serial.cxx
index d174bcd203ab74b5f88e75435211cfff071a4e0b..63d7a7abfd66d8bdb8df21b21c045bef34b0ddc8 100644 (file)
--- a/simgear/io/sg_serial.cxx
+++ b/simgear/io/sg_serial.cxx
@@ -30,7 +30,7 @@
 
 #include "sg_serial.hxx"
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 SGSerial::SGSerial( const string& device_name, const string& baud_rate ) :

diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index c6ed01bf5a087706681d795149a53b9cbc5e2ad9..87c218771ce5d81fb24ff05da711410ed0e12fd9 100644 (file)
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -43,7 +43,7 @@
 
 #include "iochannel.hxx"
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 class SGSerial : public SGIOChannel {

diff --git a/simgear/io/sg_socket.hxx b/simgear/io/sg_socket.hxx
index 0d393f4f1b4e897320f722f5da7c6b09f50e41d8..509ceca468b34490d5f2c7fe092f6fc6d3898fc5 100644 (file)
--- a/simgear/io/sg_socket.hxx
+++ b/simgear/io/sg_socket.hxx
@@ -36,7 +36,7 @@
 #include <simgear/math/sg_types.hxx>
 #include <simgear/io/iochannel.hxx>
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 #if defined(_MSC_VER)
 #  include <winsock.h>

diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx
index 8d4815073e37f87b82bca7f4e28317836020c5ff..e38ca2d1d16965a96f13ba7cd0a35df883da187a 100644 (file)
--- a/simgear/math/interpolater.cxx
+++ b/simgear/math/interpolater.cxx
@@ -36,7 +36,7 @@
 
 #include "interpolater.hxx"
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 // Constructor -- loads the interpolation table from the specified

diff --git a/simgear/math/interpolater.hxx b/simgear/math/interpolater.hxx
index 31f03dc562f3408f736cb0ed1465643bf1692d1f..f2553a5078f3570a64741f820c88b02ad7f4bdf7 100644 (file)
--- a/simgear/math/interpolater.hxx
+++ b/simgear/math/interpolater.hxx
@@ -35,7 +35,7 @@
 #include <simgear/compiler.h>
 
 #include STL_STRING
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 #define MAX_TABLE_SIZE 32
 

diff --git a/simgear/math/point3d.hxx b/simgear/math/point3d.hxx
index 35931087509955c697ac4d8670b8237deef17764..37c3055d1f86a7c0066b33785ea0d9307c2aa51d 100644 (file)
--- a/simgear/math/point3d.hxx
+++ b/simgear/math/point3d.hxx
@@ -52,12 +52,12 @@
 // already depending on how you defined SG_HAVE_STD_INCLUDES, but I
 // can go ahead and add this -- CLO
 #ifdef __MWERKS__
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 #endif
 
-#ifndef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_STD(ostream);
-FG_USING_STD(istream);
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
+SG_USING_STD(ostream);
+SG_USING_STD(istream);
 #endif
 
 

diff --git a/simgear/math/sg_geodesy.cxx b/simgear/math/sg_geodesy.cxx
index 4e0c92fb7c2176db042133e65f2a646fdd60c0ad..c2a2e0f40c6f2f314f44ce7a024204f62d9f7fba 100644 (file)
--- a/simgear/math/sg_geodesy.cxx
+++ b/simgear/math/sg_geodesy.cxx
@@ -27,8 +27,8 @@
 #include "localconsts.hxx"
 
 
-#ifndef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_STD(cout);
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
+SG_USING_STD(cout);
 #endif
 
 // ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator

diff --git a/simgear/math/sg_types.hxx b/simgear/math/sg_types.hxx
index a0d89029421a67f019d64c7d8b109dfc40d1d736..ef3ebd63e205fbec00364274459a9d9e54ef17e2 100644 (file)
--- a/simgear/math/sg_types.hxx
+++ b/simgear/math/sg_types.hxx
@@ -38,8 +38,8 @@
 
 #include <simgear/math/point3d.hxx>
 
-FG_USING_STD(vector);
-FG_USING_STD(string);
+SG_USING_STD(vector);
+SG_USING_STD(string);
 
 
 typedef vector < int > int_list;

diff --git a/simgear/metar/MetarReport.cpp b/simgear/metar/MetarReport.cpp
index 37b6a433e8fb7b50a55b5e9958ddcef5ba946629..0938a6851cc9fb0ffa76c494c160580566eb3e39 100644 (file)
--- a/simgear/metar/MetarReport.cpp
+++ b/simgear/metar/MetarReport.cpp
@@ -7,9 +7,9 @@
 #include "MetarReport.h"
 #include "Metar.h"
 
-#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(endl);
-FG_USING_STD(ostream);
+#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(endl);
+SG_USING_STD(ostream);
 #endif
 
 CMetarReport::CMetarReport(

diff --git a/simgear/metar/MetarReport.h b/simgear/metar/MetarReport.h
index 96a1739a6d8248121033779077d12403a932fdf0..21715a37eaf936f2aa64f324ce148b9257118756 100644 (file)
--- a/simgear/metar/MetarReport.h
+++ b/simgear/metar/MetarReport.h
@@ -16,7 +16,7 @@
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 class CMetarReport
 {

diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp
index 935c8a8ae1383ef2aa2ffbe25424ff15757673af..a2122f6df2dd00a38b9c99f6f88dbc0adb4c5469 100644 (file)
--- a/simgear/metar/MetarStation.cpp
+++ b/simgear/metar/MetarStation.cpp
@@ -10,10 +10,10 @@
 
 #include <simgear/misc/fgpath.hxx>
 
-#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(ostream);
-FG_USING_STD(cout);
-FG_USING_STD(endl);
+#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(ostream);
+SG_USING_STD(cout);
+SG_USING_STD(endl);
 #endif
 
 

diff --git a/simgear/metar/MetarStation.h b/simgear/metar/MetarStation.h
index 72d52f6bcf61839c4ac6ac2b35c8478d4004ac90..b6f387624aecfeff3b96a035dcb141a9892119d5 100644 (file)
--- a/simgear/metar/MetarStation.h
+++ b/simgear/metar/MetarStation.h
@@ -18,9 +18,9 @@
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 
-FG_USING_STD(string);
-FG_USING_STD(vector);
-FG_USING_STD(map);
+SG_USING_STD(string);
+SG_USING_STD(vector);
+SG_USING_STD(map);
 
 class CMetarStationDB;
 

diff --git a/simgear/misc/fgpath.hxx b/simgear/misc/fgpath.hxx
index d3b861120ee1953c377b228aee416cb527f67cfc..94260461f28506bee64d563252668a9a92a58f8e 100644 (file)
--- a/simgear/misc/fgpath.hxx
+++ b/simgear/misc/fgpath.hxx
@@ -36,7 +36,7 @@
 
 #include STL_STRING
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 #ifdef macintosh

diff --git a/simgear/misc/fgstream.hxx b/simgear/misc/fgstream.hxx
index c990dd064af6f74815d36f56e41a2a55e513d66a..a7385fc7f4a9c2c3479bfa440e4f68f740344b5f 100644 (file)
--- a/simgear/misc/fgstream.hxx
+++ b/simgear/misc/fgstream.hxx
@@ -36,7 +36,7 @@
 
 #if defined( SG_HAVE_STD_INCLUDES )
 #  include <istream>
-#elif defined ( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined ( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <CC/stream.h>
 #elif defined ( __BORLANDC__ )
 #  include <iostream>
@@ -48,10 +48,10 @@
 
 #include <simgear/misc/zfstream.hxx>
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
-#ifndef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_STD(istream);
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
+SG_USING_STD(istream);
 #endif
 
 

diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx
index 2dd54a54b151349158f28b77c1c1e88b1419aa7a..1fbfb31100f3c93dcd08171d54808cfc983185fc 100644 (file)
--- a/simgear/misc/props.cxx
+++ b/simgear/misc/props.cxx
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include "props.hxx"
 
-FG_USING_STD(sort);
+SG_USING_STD(sort);
 
 
 \f

diff --git a/simgear/misc/props.hxx b/simgear/misc/props.hxx
index f1e23464f1ee644675d27b79dd2abf4a890a74eb..1e059090322dccd46521e9a25efe03dc9b05dc78 100644 (file)
--- a/simgear/misc/props.hxx
+++ b/simgear/misc/props.hxx
@@ -21,11 +21,11 @@
 #include <vector>
 #include STL_IOSTREAM
 
-FG_USING_STD(string);
-FG_USING_STD(vector);
-#if !defined(FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(istream);
-FG_USING_STD(ostream);
+SG_USING_STD(string);
+SG_USING_STD(vector);
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(istream);
+SG_USING_STD(ostream);
 #endif
 
 #ifdef ALIAS

diff --git a/simgear/misc/props_io.cxx b/simgear/misc/props_io.cxx
index 1951c229c01b1d4cabd3d96a54f68c7d3b139859..482af7a4c9fd530ea442adc02b5983274a20636b 100644 (file)
--- a/simgear/misc/props_io.cxx
+++ b/simgear/misc/props_io.cxx
@@ -14,7 +14,7 @@
 #include "props.hxx"
 
 #include STL_IOSTREAM
-#if !defined(FG_HAVE_NATIVE_SGI_COMPILERS)
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 #  include <fstream>
 #else
 #  include <fstream.h>
@@ -23,15 +23,15 @@
 #include <vector>
 #include <map>
 
-#if !defined(FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(istream);
-FG_USING_STD(ifstream);
-FG_USING_STD(ostream);
-FG_USING_STD(ofstream);
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(istream);
+SG_USING_STD(ifstream);
+SG_USING_STD(ostream);
+SG_USING_STD(ofstream);
 #endif
-FG_USING_STD(string);
-FG_USING_STD(vector);
-FG_USING_STD(map);
+SG_USING_STD(string);
+SG_USING_STD(vector);
+SG_USING_STD(map);
 
 
 \f

diff --git a/simgear/misc/props_test.cxx b/simgear/misc/props_test.cxx
index 9a0487ccb314f2c009f97c75ad3d7a952d434909..3ee2552d35349a809e21f7e4d4cd0c6509f56ef5 100644 (file)
--- a/simgear/misc/props_test.cxx
+++ b/simgear/misc/props_test.cxx
@@ -12,9 +12,9 @@
 #include STL_IOSTREAM
 #include "props.hxx"
 
-#if !defined(FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(cout);
-FG_USING_STD(endl);
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(cout);
+SG_USING_STD(endl);
 #endif
 
 

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index 40c5f7fced9b0720c8e4c93cb9caa67e088933b8..baf19f8bd7578cad7d3b40a81ab14f853ee46a9f 100644 (file)
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -34,7 +34,7 @@
 #  include <stdlib.h>
 #endif
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 // Default characters to remove.
 extern const string whitespace;

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index f95457f3c204e1a89398810634154cde3f177312..3c2ce34fbf4c02492d6295fde79b839694846b25 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -38,9 +38,9 @@
 #endif
 
 // At least Irix needs this
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#ifdef SG_HAVE_NATIVE_SGI_COMPILERS
 #include <char_traits.h>
-FG_USING_STD(char_traits);
+SG_USING_STD(char_traits);
 #endif
 
 #ifdef SG_HAVE_STD_INCLUDES
@@ -59,10 +59,10 @@ FG_USING_STD(char_traits);
 #  define ios_badbit   ios_base::badbit
 #  define ios_failbit  ios_base::failbit
 
-FG_USING_STD(streambuf);
-FG_USING_STD(ios_base);
-FG_USING_STD(streampos);
-FG_USING_STD(streamoff);
+SG_USING_STD(streambuf);
+SG_USING_STD(ios_base);
+SG_USING_STD(streampos);
+SG_USING_STD(streamoff);
 
 #else
 
@@ -81,7 +81,7 @@ FG_USING_STD(streamoff);
 
 #if defined(__GNUC__) && __GNUC_MINOR__ < 8
 #  define ios_binary   ios::bin
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  define ios_binary   0
 #else
 #  define ios_binary   ios::binary

diff --git a/simgear/route/route.hxx b/simgear/route/route.hxx
index cd241148d054ec93e1dd13cccd2bf1ba61671a8f..6d2da1f765f03c357a2033cf46a89ba242387d47 100644 (file)
--- a/simgear/route/route.hxx
+++ b/simgear/route/route.hxx
@@ -39,8 +39,8 @@
 #include STL_STRING
 #include <vector>
 
-FG_USING_STD(string);
-FG_USING_STD(vector);
+SG_USING_STD(string);
+SG_USING_STD(vector);
 
 #include <simgear/route/waypoint.hxx>
 

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index 4f66f89fa123ba671034f94d5bf9125ce2c170ff..f1ec78224ae2ff5667dcf55a553890ce50e5168e 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -38,7 +38,7 @@
 
 #include STL_STRING
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 class SGWayPoint {

diff --git a/simgear/serial/serial.hxx b/simgear/serial/serial.hxx
index 2363fa6010c84c1dc0b124a2c619e8c095aaac73..757b10d7bd919915c5403c562e9cb3a650985575 100644 (file)
--- a/simgear/serial/serial.hxx
+++ b/simgear/serial/serial.hxx
@@ -40,7 +40,7 @@
 
 #include <simgear/compiler.h>
 #include STL_STRING
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 // if someone know how to do this all with C++ streams let me know
 // #include <stdio.h>

diff --git a/simgear/sky/cloud.hxx b/simgear/sky/cloud.hxx
index 4d117e143c4154828867c7f457d0882cd26e69ff..ee1b12f2916f629e55de51ae45f68bf37476e7ba 100644 (file)
--- a/simgear/sky/cloud.hxx
+++ b/simgear/sky/cloud.hxx
@@ -34,7 +34,7 @@
 #include <plib/ssg.h>
 
 #include STL_STRING
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 #define SG_MAX_CLOUD_TYPES 4   // change this if we add/remove cloud

diff --git a/simgear/sky/sky.hxx b/simgear/sky/sky.hxx
index 4a5b9393aa159bb6e936bd9479660f51b19a0e49..edaf9c7c251562581a7a43bb6689f63c196bf9b1 100644 (file)
--- a/simgear/sky/sky.hxx
+++ b/simgear/sky/sky.hxx
@@ -45,7 +45,7 @@
 #include <simgear/sky/oursun.hxx>
 #include <simgear/sky/stars.hxx>
 
-FG_USING_STD(vector);
+SG_USING_STD(vector);
 
 
 typedef vector < SGCloudLayer* > layer_list_type;

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index 0993d6ad99251159c6fa6914eae010a7c89ae2bf..f16bcf4fdeec381a1fce3da978e865d93af03870 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -34,9 +34,9 @@
 #include <plib/sg.h>
 #include <plib/ssg.h>
 
-#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(cout);
-FG_USING_STD(endl);
+#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(cout);
+SG_USING_STD(endl);
 #endif
 
 

diff --git a/simgear/sky/stars.cxx b/simgear/sky/stars.cxx
index c96a2080b00886fe0d903d225d2a949d5ddd1cbc..b2bf7c009549b6ca1ccf548990785ae80785e363 100644 (file)
--- a/simgear/sky/stars.cxx
+++ b/simgear/sky/stars.cxx
@@ -41,9 +41,9 @@
 
 #include "stars.hxx"
 
-#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(cout);
-FG_USING_STD(endl);
+#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(cout);
+SG_USING_STD(endl);
 #endif
 
 

diff --git a/simgear/timing/geocoord.h b/simgear/timing/geocoord.h
index 186de9bb6e229289e7e27ffd4235b39d0eacc834..54fa6b45bda884c71361463f74072a2e8126fceb 100644 (file)
--- a/simgear/timing/geocoord.h
+++ b/simgear/timing/geocoord.h
@@ -43,7 +43,7 @@
 // But it looks like it isn't used anyways -:)
 #include <vector>
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 #include <simgear/constants.h>
 

diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index 6ed67cec2af9575af13e472e22938c618c15e7b0..1697fd354ccdb23d5ffcdf93eb9112f81347e70e 100644 (file)
--- a/simgear/xml/easyxml.hxx
+++ b/simgear/xml/easyxml.hxx
@@ -11,11 +11,11 @@
 #include STL_STRING
 #include <vector>
 
-#if !defined(FG_HAVE_NATIVE_SGI_COMPILERS)
-FG_USING_STD(istream);
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(istream);
 #endif
-FG_USING_STD(string);
-FG_USING_STD(vector);
+SG_USING_STD(string);
+SG_USING_STD(vector);
 
 
 /**