FG_ to SG_ name changes.

diff --git a/simgear/bucket/newbucket.hxx b/simgear/bucket/newbucket.hxx
index da5288fba1b50c30b893456e40ba3473e38a2ca2..dc48f87384d6c042f9634b6f49745f4e6772df71 100644 (file)
--- a/simgear/bucket/newbucket.hxx
+++ b/simgear/bucket/newbucket.hxx
@@ -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);

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 1d09ee014550434bde4e1359aca6d78a726a3eca..3a877b0afb02886503681de375bcab32ffa34081 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -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

diff --git a/simgear/constants.h b/simgear/constants.h
index ad6af417455821901ae25c5d033f7d569a809a3f..4dd597e780d5379d532cc4f2495ed0830e0e4983 100644 (file)
--- a/simgear/constants.h
+++ b/simgear/constants.h
@@ -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>

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index 493138ed6a5186339cc3ee6287093bbd81e5d156..fd1c878c77647064801fd946f00881941ffebf9b 100644 (file)
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -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();

diff --git a/simgear/ephemeris/celestialBody.cxx b/simgear/ephemeris/celestialBody.cxx
index 7e9a463c15021e77f17a161ca32ec8bf109fc261..7e2b2e85aed76412d92d4980b08f7874c481fba3 100644 (file)
--- a/simgear/ephemeris/celestialBody.cxx
+++ b/simgear/ephemeris/celestialBody.cxx
@@ -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>

diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index f5f7ad4f1de8e8b98108b6d191677d82dd294e08..c6ed01bf5a087706681d795149a53b9cbc5e2ad9 100644 (file)
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -33,7 +33,7 @@
 
 #include <string>
 
-// #ifdef FG_HAVE_STD_INCLUDES
+// #ifdef SG_HAVE_STD_INCLUDES
 // #  include <ctime>
 // #else
 // #  include <time.h>

diff --git a/simgear/math/point3d.hxx b/simgear/math/point3d.hxx
index 6e51b7a5c9e60d97fa25d56f15d76eaaeccea62d..35931087509955c697ac4d8670b8237deef17764 100644 (file)
--- a/simgear/math/point3d.hxx
+++ b/simgear/math/point3d.hxx
@@ -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);

diff --git a/simgear/math/sg_geodesy.cxx b/simgear/math/sg_geodesy.cxx
index b07ed2a1d3b59682aa7343cbb58f77c13f21fb4a..4e0c92fb7c2176db042133e65f2a646fdd60c0ad 100644 (file)
--- a/simgear/math/sg_geodesy.cxx
+++ b/simgear/math/sg_geodesy.cxx
@@ -9,7 +9,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 # include <cmath>
 # include <cerrno>
 # include <cstdio>

diff --git a/simgear/misc/fgstream.cxx b/simgear/misc/fgstream.cxx
index 24001681f9003526dd9a1a21bb0d235b7a5e2ff8..d3a58f0d89b116b1e979671e5bc58f9f7060f760 100644 (file)
--- a/simgear/misc/fgstream.cxx
+++ b/simgear/misc/fgstream.cxx
@@ -23,7 +23,7 @@
 
 #include <ctype.h> // isspace()
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 # include <cerrno>
 #else
 # include <errno.h>

diff --git a/simgear/misc/fgstream.hxx b/simgear/misc/fgstream.hxx
index 622ed27b0aa33745e4a8ef05ac2124e7417f951e..c990dd064af6f74815d36f56e41a2a55e513d66a 100644 (file)
--- a/simgear/misc/fgstream.hxx
+++ b/simgear/misc/fgstream.hxx
@@ -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>

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index c8c430a428722c3b5f94504eb272e961d0a3c437..40c5f7fced9b0720c8e4c93cb9caa67e088933b8 100644 (file)
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -28,7 +28,7 @@
 
 #include STL_STRING
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 #  include <cstdlib>
 #else
 #  include <stdlib.h>

diff --git a/simgear/misc/zfstream.cxx b/simgear/misc/zfstream.cxx
index 7abfa4337ecd3a4aa30b359d79f9215277de88ad..fc795ee3ecbada4d2e0b15ff6a654a6fc081f4ba 100644 (file)
--- a/simgear/misc/zfstream.cxx
+++ b/simgear/misc/zfstream.cxx
@@ -24,7 +24,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 # include <cerrno>
 #else
 # include <errno.h>

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index 7a319ddd136b7f00a3bec370c4cf9953ee4949f1..f95457f3c204e1a89398810634154cde3f177312 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -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;

diff --git a/simgear/serial/serial.cxx b/simgear/serial/serial.cxx
index 7c4257dea37201f9d94cf5507caf7a63c3387915..a46570d240b6a89d6f202f7733f5ffc05cd63d85 100644 (file)
--- a/simgear/serial/serial.cxx
+++ b/simgear/serial/serial.cxx
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDE
+#ifdef SG_HAVE_STD_INCLUDE
 #  include <cerrno>
 #else
 #  include <errno.h>