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

FG_ to SG_ name changes.

Browse Source
This commit is contained in:
curt 2001-03-23 21:42:18 +00:00
parent 013687dccd
commit d498199e8a
14 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/bucket/newbucket.hxx
View File

@ -33,7 +33,7 @@
#include <simgear/compiler.h>
#include <simgear/constants.h>
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <cmath>
# include <cstdio> // sprintf()
#else
@ -44,7 +44,7 @@
#include STL_IOSTREAM
// I don't understand ... <math.h> or <cmath> should be included
// already depending on how you defined FG_HAVE_STD_INCLUDES, but I
// 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);

84
simgear/compiler.h
View File

@ -46,23 +46,23 @@
* (8) Defines SG_NO_ARROW_OPERATOR if the compiler is unable
* to support operator->() for iterators.
*
* (9) Defines FG_USE_EXCEPTIONS if the compiler supports exceptions.
* (9) Defines SG_USE_EXCEPTIONS if the compiler supports exceptions.
* Note: no FlightGear code uses exceptions.
*
* (10) Define FG_NAMESPACES if the compiler supports namespaces.
* (10) Define SG_NAMESPACES if the compiler supports namespaces.
*
* (11) FG_MATH_FN_IN_NAMESPACE_STD -- not used??
* (11) SG_MATH_FN_IN_NAMESPACE_STD -- not used??
*
* (12) Define FG_HAVE_STD if std namespace is supported.
* (12) Define SG_HAVE_STD if std namespace is supported.
*
* (13) Defines FG_CLASS_PARTIAL_SPECIALIZATION if the compiler
* (13) Defines SG_CLASS_PARTIAL_SPECIALIZATION if the compiler
* supports partial specialization of class templates.
*
* (14) Defines FG_HAVE_STD_INCLUDES to use ISO C++ Standard headers.
* (14) Defines SG_HAVE_STD_INCLUDES to use ISO C++ Standard headers.
*
* (15) Defines FG_HAVE_STREAMBUF if <streambuf> of <streambuf.h> are present.
* (15) Defines SG_HAVE_STREAMBUF if <streambuf> of <streambuf.h> are present.
*
* (16) Define FG_MATH_EXCEPTION_CLASH if math.h defines an exception class
* (16) Define SG_MATH_EXCEPTION_CLASH if math.h defines an exception class
* that clashes with the one defined in <stdexcept>.
*/
@ -84,8 +84,8 @@
# define STL_STRSTREAM <strstream.h>
# define SG_NEED_AUTO_PTR
# define FG_NO_DEFAULT_TEMPLATE_ARGS
# define FG_INCOMPLETE_FUNCTIONAL
# define SG_NO_DEFAULT_TEMPLATE_ARGS
# define SG_INCOMPLETE_FUNCTIONAL
# define SG_NO_ARROW_OPERATOR
# elif __GNUC_MINOR__ >= 8
@ -94,10 +94,10 @@
# define SG_EXPLICIT_FUNCTION_TMPL_ARGS
# define SG_NEED_AUTO_PTR
# define FG_MEMBER_TEMPLATES
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_HAVE_STREAMBUF
# define FG_CLASS_PARTIAL_SPECIALIZATION
# define SG_NAMESPACES
# define SG_HAVE_STD
# define SG_HAVE_STREAMBUF
# define SG_CLASS_PARTIAL_SPECIALIZATION
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
@ -117,11 +117,11 @@
/* KAI C++ */
#if defined(__KCC)
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_HAVE_STREAMBUF
# define SG_NAMESPACES
# define SG_HAVE_STD
# define SG_HAVE_STREAMBUF
# define FG_HAVE_TRAITS
# define FG_HAVE_STD_INCLUDES
# define SG_HAVE_STD_INCLUDES
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
@ -141,9 +141,9 @@
CodeWarrior compiler from Metrowerks, Inc.
*/
# define FG_HAVE_TRAITS
# define FG_HAVE_STD_INCLUDES
# define FG_HAVE_STD
# define FG_NAMESPACES
# define SG_HAVE_STD_INCLUDES
# define SG_HAVE_STD
# define SG_NAMESPACES
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
@ -171,10 +171,10 @@
# define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
# if _MSC_VER == 1200 // msvc++ 6.0
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_HAVE_STD_INCLUDES
# define FG_HAVE_STREAMBUF
# define SG_NAMESPACES
# define SG_HAVE_STD
# define SG_HAVE_STD_INCLUDES
# define SG_HAVE_STREAMBUF
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
@ -191,10 +191,10 @@
# elif _MSC_VER == 1100 // msvc++ 5.0
# define NEEDNAMESPACESTD
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_HAVE_STD_INCLUDES
# define FG_HAVE_STREAMBUF
# define SG_NAMESPACES
# define SG_HAVE_STD
# define SG_HAVE_STD_INCLUDES
# define SG_HAVE_STREAMBUF
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
@ -222,7 +222,7 @@
# define STL_ALGORITHM "algorithm"
# define STL_FUNCTIONAL "functional"
# define FG_MATH_EXCEPTION_CLASH
# define SG_MATH_EXCEPTION_CLASH
# else
@ -232,16 +232,16 @@
# define STL_STDEXCEPT <stdexcept>
# define STL_STRSTREAM <strstream>
# define FG_INCOMPLETE_FUNCTIONAL
# define SG_INCOMPLETE_FUNCTIONAL
# endif // HAVE_SGI_STL_PORT
# define STL_IOSTREAM <iostream>
# define STL_FSTREAM <fstream>
# define STL_STRING <string>
# define FG_NO_DEFAULT_TEMPLATE_ARGS
# define FG_NAMESPACES
// # define FG_HAVE_STD
# define SG_NO_DEFAULT_TEMPLATE_ARGS
# define SG_NAMESPACES
// # define SG_HAVE_STD
#endif // __BORLANDC__
@ -255,9 +255,9 @@
# define SG_EXPLICIT_FUNCTION_TMPL_ARGS
# define SG_NEED_AUTO_PTR
# define FG_MEMBER_TEMPLATES
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_CLASS_PARTIAL_SPECIALIZATION
# define SG_NAMESPACES
# define SG_HAVE_STD
# define SG_CLASS_PARTIAL_SPECIALIZATION
# define FG_HAVE_TRAITS
# define STL_ALGORITHM <algorithm>
@ -313,7 +313,7 @@
# define FG_NULL_TMPL_ARGS
#endif
#ifdef FG_CLASS_PARTIAL_SPECIALIZATION
#ifdef SG_CLASS_PARTIAL_SPECIALIZATION
# define FG_TEMPLATE_NULL template<>
#else
# define FG_TEMPLATE_NULL
@ -321,7 +321,7 @@
// FG_NO_NAMESPACES is a hook so that users can disable namespaces
// without having to edit library headers.
#if defined(FG_NAMESPACES) && !defined(FG_NO_NAMESPACES)
#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
@ -331,7 +331,7 @@
# define FG_USING_NAMESPACE(X)
#endif
# ifdef FG_HAVE_STD
# ifdef SG_HAVE_STD
# define FG_USING_STD(X) using std::X
# define STD std
# else
@ -341,7 +341,7 @@
// Additional <functional> implementation from SGI STL 3.11
// Adapter function objects: pointers to member functions
#ifdef FG_INCOMPLETE_FUNCTIONAL
#ifdef SG_INCOMPLETE_FUNCTIONAL
template <class _Ret, class _Tp>
class const_mem_fun_ref_t
@ -360,6 +360,6 @@ template <class _Ret, class _Tp>
inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const)
{ return const_mem_fun_ref_t<_Ret,_Tp>(__f); }
#endif // FG_INCOMPLETE_FUNCTIONAL
#endif // SG_INCOMPLETE_FUNCTIONAL
#endif // _SG_COMPILER_H

4
simgear/constants.h
View File

@ -32,10 +32,10 @@
#include <simgear/compiler.h>
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <cmath>
#else
# ifdef FG_MATH_EXCEPTION_CLASH
# ifdef SG_MATH_EXCEPTION_CLASH
# define exception C_exception
# endif
# include <math.h>

6
simgear/debug/logstream.hxx
View File

@ -36,7 +36,7 @@
#include <char_traits.h>
#endif
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <streambuf>
# include <iostream>
#else
@ -77,7 +77,7 @@ class logbuf : public streambuf
{
public:
#ifndef FG_HAVE_STD_INCLUDES
#ifndef SG_HAVE_STD_INCLUDES
typedef char_traits<char> traits_type;
typedef char_traits<char>::int_type int_type;
// typedef char_traits<char>::pos_type pos_type;
@ -124,7 +124,7 @@ private:
inline int
logbuf::sync()
{
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
return sbuf->pubsync();
#else
return sbuf->sync();

2
simgear/ephemeris/celestialBody.cxx
View File

@ -25,7 +25,7 @@
#include <simgear/debug/logstream.hxx>
#ifdef FG_MATH_EXCEPTION_CLASH
#ifdef SG_MATH_EXCEPTION_CLASH
# define exception c_exception
#endif
#include <math.h>

2
simgear/io/sg_serial.hxx
View File

@ -33,7 +33,7 @@
#include <string>
// #ifdef FG_HAVE_STD_INCLUDES
// #ifdef SG_HAVE_STD_INCLUDES
// # include <ctime>
// #else
// # include <time.h>

6
simgear/math/point3d.hxx
View File

@ -32,11 +32,11 @@
#include <simgear/compiler.h>
#ifdef FG_MATH_EXCEPTION_CLASH
#ifdef SG_MATH_EXCEPTION_CLASH
# define exception c_exception
#endif
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <iostream>
# include <cassert>
# include <cmath>
@ -49,7 +49,7 @@
#include <simgear/math/localconsts.hxx>
// I don't understand ... <math.h> or <cmath> should be included
// already depending on how you defined FG_HAVE_STD_INCLUDES, but I
// 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);

2
simgear/math/sg_geodesy.cxx
View File

@ -9,7 +9,7 @@
#include <simgear/compiler.h>
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <cmath>
# include <cerrno>
# include <cstdio>

2
simgear/misc/fgstream.cxx
View File

@ -23,7 +23,7 @@
#include <ctype.h> // isspace()
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <cerrno>
#else
# include <errno.h>

2
simgear/misc/fgstream.hxx
View File

@ -34,7 +34,7 @@
#include <simgear/compiler.h>
#if defined( FG_HAVE_STD_INCLUDES )
#if defined( SG_HAVE_STD_INCLUDES )
# include <istream>
#elif defined ( FG_HAVE_NATIVE_SGI_COMPILERS )
# include <CC/stream.h>

2
simgear/misc/strutils.hxx
View File

@ -28,7 +28,7 @@
#include STL_STRING
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <cstdlib>
#else
# include <stdlib.h>

2
simgear/misc/zfstream.cxx
View File

@ -24,7 +24,7 @@
#include <simgear/compiler.h>
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <cerrno>
#else
# include <errno.h>

8
simgear/misc/zfstream.hxx
View File

@ -43,7 +43,7 @@
FG_USING_STD(char_traits);
#endif
#ifdef FG_HAVE_STD_INCLUDES
#ifdef SG_HAVE_STD_INCLUDES
# include <streambuf>
# include <istream>
@ -66,7 +66,7 @@ FG_USING_STD(streamoff);
#else
# ifdef FG_HAVE_STREAMBUF
# ifdef SG_HAVE_STREAMBUF
# include <streambuf.h>
# include <istream.h>
# else
@ -94,7 +94,7 @@ FG_USING_STD(streamoff);
# include <simgear/fg_traits.hxx>
#endif // FG_HAVE_STD_INCLUDES
#endif // SG_HAVE_STD_INCLUDES
//-----------------------------------------------------------------------------
//
@ -104,7 +104,7 @@ class gzfilebuf : public streambuf
{
public:
#ifndef FG_HAVE_STD_INCLUDES
#ifndef SG_HAVE_STD_INCLUDES
typedef char_traits<char> traits_type;
typedef char_traits<char>::int_type int_type;
// typedef char_traits<char>::pos_type pos_type;

2
simgear/serial/serial.cxx
View File

@ -28,7 +28,7 @@
#include <simgear/compiler.h>
#ifdef FG_HAVE_STD_INCLUDE
#ifdef SG_HAVE_STD_INCLUDE
# include <cerrno>
#else
# include <errno.h>