FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FG_ to SG_ namespace changes.

Browse Source
This commit is contained in:
curt
2001-03-23 21:59:44 +00:00
parent d498199e8a
commit c16b9ed25b
38 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/bucket/newbucket.hxx
View File

@@ -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

48
simgear/compiler.h
View File

@@ -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

16
simgear/debug/logstream.hxx
View File

@@ -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
//

4
simgear/ephemeris/stardata.cxx
View File

@@ -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

6
simgear/fg_traits.hxx
View File

@@ -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

4
simgear/io/iochannel.hxx
View File

@@ -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

10
simgear/io/sg_binobj.cxx
View File

@@ -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

2
simgear/io/sg_file.cxx
View File

@@ -33,7 +33,7 @@
#include "sg_file.hxx"
FG_USING_STD(string);
SG_USING_STD(string);
SGFile::SGFile( const string &file) {

2
simgear/io/sg_file.hxx
View File

@@ -42,7 +42,7 @@
#include "iochannel.hxx"
FG_USING_STD(string);
SG_USING_STD(string);
class SGFile : public SGIOChannel {

2
simgear/io/sg_serial.cxx
View File

@@ -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 ) :

2
simgear/io/sg_serial.hxx
View File

@@ -43,7 +43,7 @@
#include "iochannel.hxx"
FG_USING_STD(string);
SG_USING_STD(string);
class SGSerial : public SGIOChannel {

2
simgear/io/sg_socket.hxx
View File

@@ -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>

2
simgear/math/interpolater.cxx
View File

@@ -36,7 +36,7 @@
#include "interpolater.hxx"
FG_USING_STD(string);
SG_USING_STD(string);
// Constructor -- loads the interpolation table from the specified

2
simgear/math/interpolater.hxx
View File

@@ -35,7 +35,7 @@
#include <simgear/compiler.h>
#include STL_STRING
FG_USING_STD(string);
SG_USING_STD(string);
#define MAX_TABLE_SIZE 32

8
simgear/math/point3d.hxx
View File

@@ -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

4
simgear/math/sg_geodesy.cxx
View File

@@ -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

4
simgear/math/sg_types.hxx
View File

@@ -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;

6
simgear/metar/MetarReport.cpp
View File

@@ -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(

2
simgear/metar/MetarReport.h
View File

@@ -16,7 +16,7 @@
#include <simgear/math/point3d.hxx>
#include <simgear/math/polar3d.hxx>
FG_USING_STD(string);
SG_USING_STD(string);
class CMetarReport
{

8
simgear/metar/MetarStation.cpp
View File

@@ -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

6
simgear/metar/MetarStation.h
View File

@@ -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;

2
simgear/misc/fgpath.hxx
View File

@@ -36,7 +36,7 @@
#include STL_STRING
FG_USING_STD(string);
SG_USING_STD(string);
#ifdef macintosh

8
simgear/misc/fgstream.hxx
View File

@@ -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

2
simgear/misc/props.cxx
View File

@@ -18,7 +18,7 @@
#include <algorithm>
#include "props.hxx"
FG_USING_STD(sort);
SG_USING_STD(sort);

10
simgear/misc/props.hxx
View File

@@ -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

18
simgear/misc/props_io.cxx
View File

@@ -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);

6
simgear/misc/props_test.cxx
View File

@@ -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

2
simgear/misc/strutils.hxx
View File

@@ -34,7 +34,7 @@
# include <stdlib.h>
#endif
FG_USING_STD(string);
SG_USING_STD(string);
// Default characters to remove.
extern const string whitespace;

14
simgear/misc/zfstream.hxx
View File

@@ -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

4
simgear/route/route.hxx
View File

@@ -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>

2
simgear/route/waypoint.hxx
View File

@@ -38,7 +38,7 @@
#include STL_STRING
FG_USING_STD(string);
SG_USING_STD(string);
class SGWayPoint {

2
simgear/serial/serial.hxx
View File

@@ -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>

2
simgear/sky/cloud.hxx
View File

@@ -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

2
simgear/sky/sky.hxx
View File

@@ -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;

6
simgear/sky/sphere.cxx
View File

@@ -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

6
simgear/sky/stars.cxx
View File

@@ -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

2
simgear/timing/geocoord.h
View File

@@ -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>

8
simgear/xml/easyxml.hxx
View File

@@ -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);
/**