From c16b9ed25b9c8d7229153787aa1492e4ea37b61e Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 23 Mar 2001 21:59:44 +0000 Subject: [PATCH] FG_ to SG_ namespace changes. --- simgear/bucket/newbucket.hxx | 10 +++---- simgear/compiler.h | 48 +++++++++++++++++----------------- simgear/debug/logstream.hxx | 16 ++++++------ simgear/ephemeris/stardata.cxx | 4 +-- simgear/fg_traits.hxx | 6 ++--- simgear/io/iochannel.hxx | 4 +-- simgear/io/sg_binobj.cxx | 10 +++---- simgear/io/sg_file.cxx | 2 +- simgear/io/sg_file.hxx | 2 +- simgear/io/sg_serial.cxx | 2 +- simgear/io/sg_serial.hxx | 2 +- simgear/io/sg_socket.hxx | 2 +- simgear/math/interpolater.cxx | 2 +- simgear/math/interpolater.hxx | 2 +- simgear/math/point3d.hxx | 8 +++--- simgear/math/sg_geodesy.cxx | 4 +-- simgear/math/sg_types.hxx | 4 +-- simgear/metar/MetarReport.cpp | 6 ++--- simgear/metar/MetarReport.h | 2 +- simgear/metar/MetarStation.cpp | 8 +++--- simgear/metar/MetarStation.h | 6 ++--- simgear/misc/fgpath.hxx | 2 +- simgear/misc/fgstream.hxx | 8 +++--- simgear/misc/props.cxx | 2 +- simgear/misc/props.hxx | 10 +++---- simgear/misc/props_io.cxx | 18 ++++++------- simgear/misc/props_test.cxx | 6 ++--- simgear/misc/strutils.hxx | 2 +- simgear/misc/zfstream.hxx | 14 +++++----- simgear/route/route.hxx | 4 +-- simgear/route/waypoint.hxx | 2 +- simgear/serial/serial.hxx | 2 +- simgear/sky/cloud.hxx | 2 +- simgear/sky/sky.hxx | 2 +- simgear/sky/sphere.cxx | 6 ++--- simgear/sky/stars.cxx | 6 ++--- simgear/timing/geocoord.h | 2 +- simgear/xml/easyxml.hxx | 8 +++--- 38 files changed, 123 insertions(+), 123 deletions(-) diff --git a/simgear/bucket/newbucket.hxx b/simgear/bucket/newbucket.hxx index dc48f873..1564987d 100644 --- 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 3a877b0a..e77233e7 100644 --- 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 @@ -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 # define STL_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 fd1c878c..d622d117 100644 --- a/simgear/debug/logstream.hxx +++ b/simgear/debug/logstream.hxx @@ -32,7 +32,7 @@ #include // At least Irix needs this -#ifdef FG_HAVE_NATIVE_SGI_COMPILERS +#ifdef SG_HAVE_NATIVE_SGI_COMPILERS #include #endif @@ -46,17 +46,17 @@ #include -#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 f153b527..8f69356f 100644 --- 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 ad1084bf..ed8c926a 100644 --- a/simgear/fg_traits.hxx +++ b/simgear/fg_traits.hxx @@ -3,12 +3,12 @@ #include -#ifndef FG_HAVE_TRAITS +#ifndef SG_HAVE_TRAITS // Dummy up some char traits for now. template struct char_traits{}; -FG_TEMPLATE_NULL +SG_TEMPLATE_NULL struct char_traits { typedef char char_type; @@ -18,6 +18,6 @@ struct char_traits 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 1d324be2..1651c106 100644 --- a/simgear/io/iochannel.hxx +++ b/simgear/io/iochannel.hxx @@ -32,8 +32,8 @@ #include STL_STRING #include -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 487ff9a1..03c1b2c2 100644 --- 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 912bcb6c..ed740275 100644 --- 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 00d47143..a0c35e6c 100644 --- 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 d174bcd2..63d7a7ab 100644 --- 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 c6ed01bf..87c21877 100644 --- 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 0d393f4f..509ceca4 100644 --- a/simgear/io/sg_socket.hxx +++ b/simgear/io/sg_socket.hxx @@ -36,7 +36,7 @@ #include #include -FG_USING_STD(string); +SG_USING_STD(string); #if defined(_MSC_VER) # include diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx index 8d481507..e38ca2d1 100644 --- 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 31f03dc5..f2553a50 100644 --- a/simgear/math/interpolater.hxx +++ b/simgear/math/interpolater.hxx @@ -35,7 +35,7 @@ #include #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 35931087..37c3055d 100644 --- 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 4e0c92fb..c2a2e0f4 100644 --- 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 a0d89029..ef3ebd63 100644 --- a/simgear/math/sg_types.hxx +++ b/simgear/math/sg_types.hxx @@ -38,8 +38,8 @@ #include -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 37b6a433..0938a685 100644 --- 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 96a1739a..21715a37 100644 --- a/simgear/metar/MetarReport.h +++ b/simgear/metar/MetarReport.h @@ -16,7 +16,7 @@ #include #include -FG_USING_STD(string); +SG_USING_STD(string); class CMetarReport { diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp index 935c8a8a..a2122f6d 100644 --- a/simgear/metar/MetarStation.cpp +++ b/simgear/metar/MetarStation.cpp @@ -10,10 +10,10 @@ #include -#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 72d52f6b..b6f38762 100644 --- a/simgear/metar/MetarStation.h +++ b/simgear/metar/MetarStation.h @@ -18,9 +18,9 @@ #include #include -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 d3b86112..94260461 100644 --- 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 c990dd06..a7385fc7 100644 --- a/simgear/misc/fgstream.hxx +++ b/simgear/misc/fgstream.hxx @@ -36,7 +36,7 @@ #if defined( SG_HAVE_STD_INCLUDES ) # include -#elif defined ( FG_HAVE_NATIVE_SGI_COMPILERS ) +#elif defined ( SG_HAVE_NATIVE_SGI_COMPILERS ) # include #elif defined ( __BORLANDC__ ) # include @@ -48,10 +48,10 @@ #include -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 2dd54a54..1fbfb311 100644 --- a/simgear/misc/props.cxx +++ b/simgear/misc/props.cxx @@ -18,7 +18,7 @@ #include #include "props.hxx" -FG_USING_STD(sort); +SG_USING_STD(sort); diff --git a/simgear/misc/props.hxx b/simgear/misc/props.hxx index f1e23464..1e059090 100644 --- a/simgear/misc/props.hxx +++ b/simgear/misc/props.hxx @@ -21,11 +21,11 @@ #include #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 1951c229..482af7a4 100644 --- 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 #else # include @@ -23,15 +23,15 @@ #include #include -#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); diff --git a/simgear/misc/props_test.cxx b/simgear/misc/props_test.cxx index 9a0487cc..3ee2552d 100644 --- 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 40c5f7fc..baf19f8b 100644 --- a/simgear/misc/strutils.hxx +++ b/simgear/misc/strutils.hxx @@ -34,7 +34,7 @@ # include #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 f95457f3..3c2ce34f 100644 --- 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 -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 cd241148..6d2da1f7 100644 --- a/simgear/route/route.hxx +++ b/simgear/route/route.hxx @@ -39,8 +39,8 @@ #include STL_STRING #include -FG_USING_STD(string); -FG_USING_STD(vector); +SG_USING_STD(string); +SG_USING_STD(vector); #include diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx index 4f66f89f..f1ec7822 100644 --- 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 2363fa60..757b10d7 100644 --- a/simgear/serial/serial.hxx +++ b/simgear/serial/serial.hxx @@ -40,7 +40,7 @@ #include #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 diff --git a/simgear/sky/cloud.hxx b/simgear/sky/cloud.hxx index 4d117e14..ee1b12f2 100644 --- a/simgear/sky/cloud.hxx +++ b/simgear/sky/cloud.hxx @@ -34,7 +34,7 @@ #include #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 4a5b9393..edaf9c7c 100644 --- a/simgear/sky/sky.hxx +++ b/simgear/sky/sky.hxx @@ -45,7 +45,7 @@ #include #include -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 0993d6ad..f16bcf4f 100644 --- a/simgear/sky/sphere.cxx +++ b/simgear/sky/sphere.cxx @@ -34,9 +34,9 @@ #include #include -#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 c96a2080..b2bf7c00 100644 --- 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 186de9bb..54fa6b45 100644 --- a/simgear/timing/geocoord.h +++ b/simgear/timing/geocoord.h @@ -43,7 +43,7 @@ // But it looks like it isn't used anyways -:) #include -FG_USING_NAMESPACE(std); +SG_USING_NAMESPACE(std); #include diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx index 6ed67cec..1697fd35 100644 --- a/simgear/xml/easyxml.hxx +++ b/simgear/xml/easyxml.hxx @@ -11,11 +11,11 @@ #include STL_STRING #include -#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); /** -- 2.39.5