diff --git a/simgear/bucket/newbucket.hxx b/simgear/bucket/newbucket.hxx index da5288fb..dc48f873 100644 --- a/simgear/bucket/newbucket.hxx +++ b/simgear/bucket/newbucket.hxx @@ -33,7 +33,7 @@ #include #include -#ifdef FG_HAVE_STD_INCLUDES +#ifdef SG_HAVE_STD_INCLUDES # include # include // sprintf() #else @@ -44,7 +44,7 @@ #include STL_IOSTREAM // I don't understand ... or 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 1d09ee01..3a877b0a 100644 --- 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 of are present. + * (15) Defines SG_HAVE_STREAMBUF if of 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 . */ @@ -84,8 +84,8 @@ # define STL_STRSTREAM # 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 # define STL_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 # define STL_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 # define STL_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 # define STL_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 # define STL_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 # define STL_STRSTREAM -# define FG_INCOMPLETE_FUNCTIONAL +# define SG_INCOMPLETE_FUNCTIONAL # endif // HAVE_SGI_STL_PORT # define STL_IOSTREAM # define STL_FSTREAM # define STL_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 @@ -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 implementation from SGI STL 3.11 // Adapter function objects: pointers to member functions -#ifdef FG_INCOMPLETE_FUNCTIONAL +#ifdef SG_INCOMPLETE_FUNCTIONAL template class const_mem_fun_ref_t @@ -360,6 +360,6 @@ template 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 ad6af417..4dd597e7 100644 --- a/simgear/constants.h +++ b/simgear/constants.h @@ -32,10 +32,10 @@ #include -#ifdef FG_HAVE_STD_INCLUDES +#ifdef SG_HAVE_STD_INCLUDES # include #else -# ifdef FG_MATH_EXCEPTION_CLASH +# ifdef SG_MATH_EXCEPTION_CLASH # define exception C_exception # endif # include diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx index 493138ed..fd1c878c 100644 --- a/simgear/debug/logstream.hxx +++ b/simgear/debug/logstream.hxx @@ -36,7 +36,7 @@ #include #endif -#ifdef FG_HAVE_STD_INCLUDES +#ifdef SG_HAVE_STD_INCLUDES # include # include #else @@ -77,7 +77,7 @@ class logbuf : public streambuf { public: -#ifndef FG_HAVE_STD_INCLUDES +#ifndef SG_HAVE_STD_INCLUDES typedef char_traits traits_type; typedef char_traits::int_type int_type; // typedef char_traits::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 7e9a463c..7e2b2e85 100644 --- a/simgear/ephemeris/celestialBody.cxx +++ b/simgear/ephemeris/celestialBody.cxx @@ -25,7 +25,7 @@ #include -#ifdef FG_MATH_EXCEPTION_CLASH +#ifdef SG_MATH_EXCEPTION_CLASH # define exception c_exception #endif #include diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx index f5f7ad4f..c6ed01bf 100644 --- a/simgear/io/sg_serial.hxx +++ b/simgear/io/sg_serial.hxx @@ -33,7 +33,7 @@ #include -// #ifdef FG_HAVE_STD_INCLUDES +// #ifdef SG_HAVE_STD_INCLUDES // # include // #else // # include diff --git a/simgear/math/point3d.hxx b/simgear/math/point3d.hxx index 6e51b7a5..35931087 100644 --- a/simgear/math/point3d.hxx +++ b/simgear/math/point3d.hxx @@ -32,11 +32,11 @@ #include -#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 # include # include @@ -49,7 +49,7 @@ #include // I don't understand ... or 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 b07ed2a1..4e0c92fb 100644 --- a/simgear/math/sg_geodesy.cxx +++ b/simgear/math/sg_geodesy.cxx @@ -9,7 +9,7 @@ #include -#ifdef FG_HAVE_STD_INCLUDES +#ifdef SG_HAVE_STD_INCLUDES # include # include # include diff --git a/simgear/misc/fgstream.cxx b/simgear/misc/fgstream.cxx index 24001681..d3a58f0d 100644 --- a/simgear/misc/fgstream.cxx +++ b/simgear/misc/fgstream.cxx @@ -23,7 +23,7 @@ #include // isspace() -#ifdef FG_HAVE_STD_INCLUDES +#ifdef SG_HAVE_STD_INCLUDES # include #else # include diff --git a/simgear/misc/fgstream.hxx b/simgear/misc/fgstream.hxx index 622ed27b..c990dd06 100644 --- a/simgear/misc/fgstream.hxx +++ b/simgear/misc/fgstream.hxx @@ -34,7 +34,7 @@ #include -#if defined( FG_HAVE_STD_INCLUDES ) +#if defined( SG_HAVE_STD_INCLUDES ) # include #elif defined ( FG_HAVE_NATIVE_SGI_COMPILERS ) # include diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx index c8c430a4..40c5f7fc 100644 --- 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 #else # include diff --git a/simgear/misc/zfstream.cxx b/simgear/misc/zfstream.cxx index 7abfa433..fc795ee3 100644 --- a/simgear/misc/zfstream.cxx +++ b/simgear/misc/zfstream.cxx @@ -24,7 +24,7 @@ #include -#ifdef FG_HAVE_STD_INCLUDES +#ifdef SG_HAVE_STD_INCLUDES # include #else # include diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx index 7a319ddd..f95457f3 100644 --- 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 # include @@ -66,7 +66,7 @@ FG_USING_STD(streamoff); #else -# ifdef FG_HAVE_STREAMBUF +# ifdef SG_HAVE_STREAMBUF # include # include # else @@ -94,7 +94,7 @@ FG_USING_STD(streamoff); # include -#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 traits_type; typedef char_traits::int_type int_type; // typedef char_traits::pos_type pos_type; diff --git a/simgear/serial/serial.cxx b/simgear/serial/serial.cxx index 7c4257de..a46570d2 100644 --- a/simgear/serial/serial.cxx +++ b/simgear/serial/serial.cxx @@ -28,7 +28,7 @@ #include -#ifdef FG_HAVE_STD_INCLUDE +#ifdef SG_HAVE_STD_INCLUDE # include #else # include