Reduce compiler.h to almost nothing (but it's worth keeping around I think, for

the MSVC and MipsPro warning stuff).

As a result of this patch, simgear/sg_traits.h can be deleted. So can SGCMath.h,
but I'll do that separately.

There is one more 'mechanical' change to come - getting rid of SG_USING_STD(X),
but I want to keep that separate from everything else. (There's another mechnica
l change, replacing <math.h> with <cmath> and so on *everywhere*, but one step a
t a time)

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 112fac7a9789f96e698db475b903d7f559eaa34d..44e28bb1b1c9db61e86f4c246d8485a25b0f8211 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -10,7 +10,7 @@ METAR_DIRS = environment
 EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 version.h.in
 
 include_HEADERS = \
-       compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
+       compiler.h constants.h sg_inlines.h version.h
 
 SUBDIRS = \
        $(compatibility_DIR) \

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 5e64764bbac4f9c61ce4b8397c42895d370bfbe0..beb409fdacfcec62cba97001a27708393fdc2925 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -23,45 +23,8 @@
  * A set of defines to encapsulate compiler and platform differences.
  * Please refer to the source code for full documentation on this file.
  *
- * Here is a summary of what this file does.
- *
- *  (1)  Defines macros for some STL includes which may be affected
- *       by file name length limitations.
- *
- *  (2)  Defines macros for some features not supported by all C++ compilers.
- *
- *  (3)  Defines 'explicit' as a null macro if the compiler doesn't support
- *       the explicit keyword.
- *
- *  (4)  Defines 'typename' as a null macro if the compiler doesn't support
- *       the typename keyword.
- *
- *  (5)  Defines bool, true and false if the compiler doesn't do so.
- *
- *  (6)  Defines SG_EXPLICIT_FUNCTION_TMPL_ARGS if the compiler
- *       supports calling a function template by providing its template
- *       arguments explicitly.
- *
- *  (7)  Defines SG_NEED_AUTO_PTR if STL doesn't provide auto_ptr<>.
- *
- *  (8)  Defines SG_NO_ARROW_OPERATOR if the compiler is unable
- *       to support operator->() for iterators.
- *
- *  (9)  Defines SG_USE_EXCEPTIONS if the compiler supports exceptions.
- *       Note: no FlightGear code uses exceptions.
- *
- *  (10) Define SG_NAMESPACES if the compiler supports namespaces.
- *
- *  (11) SG_MATH_FN_IN_NAMESPACE_STD -- not used??
- *
- *  (12) Define SG_HAVE_STD if std namespace is supported.
- *
- *  (13) Defines SG_CLASS_PARTIAL_SPECIALIZATION if the compiler 
- *       supports partial specialization of class templates.
- *
- *  (14) Defines SG_HAVE_STD_INCLUDES to use ISO C++ Standard headers.
- *
- *  (15) Defines SG_HAVE_STREAMBUF if <streambuf> of <streambuf.h> are present.
+ * This file is useful to set compiler-specific options in every file - for
+ * example, disabling warnings.
  *
  */
 
@@ -77,55 +40,18 @@
 #define SG_DO_STRINGIZE(X) #X
 
 #ifdef __GNUC__
-#  if __GNUC__ >= 3
-       // g++-3.0.x
-#      define SG_EXPLICIT_FUNCTION_TMPL_ARGS
-#      define SG_NEED_AUTO_PTR
-#      define SG_MEMBER_TEMPLATES
-#      define SG_NAMESPACES
-#      define SG_HAVE_STD
-#      define SG_HAVE_STREAMBUF
-#      define SG_CLASS_PARTIAL_SPECIALIZATION
-#      define SG_HAVE_STD_INCLUDES
-
-#      define STL_ALGORITHM  <algorithm>
-#      define STL_FUNCTIONAL <functional>
-#      define STL_IOMANIP    <iomanip>
-#      define STL_IOSTREAM   <iostream>
-#      define STL_ITERATOR   <iterator>
-#      define STL_FSTREAM    <fstream>
-#      define STL_STDEXCEPT  <stdexcept>
-#      define STL_STRING     <string>
-#      define STL_STRSTREAM  <strstream>
-#  else
+#  if __GNUC__ < 3
 #    error Time to upgrade. GNU compilers < 3.0 not supported
+#  elif (__GNUC__ == 3) && (__GNUC_MINOR__ < 4)
+#    warning GCC compilers prior to 3.4 are suspect  
 #  endif
 
 #  define SG_COMPILER_STR "GNU C++ version " SG_STRINGIZE(__GNUC__) "." SG_STRINGIZE(__GNUC_MINOR__)
-
 #endif // __GNUC__
 
 /* KAI C++ */
 #if defined(__KCC)
-
-#  define SG_NAMESPACES
-#  define SG_HAVE_STD
-#  define SG_HAVE_STREAMBUF
-#  define SG_HAVE_TRAITS
-#  define SG_HAVE_STD_INCLUDES
-
-#  define STL_ALGORITHM  <algorithm>
-#  define STL_FUNCTIONAL <functional>
-#  define STL_IOMANIP    <iomanip>
-#  define STL_IOSTREAM   <iostream>
-#  define STL_ITERATOR   <iterator>
-#  define STL_FSTREAM    <fstream>
-#  define STL_STDEXCEPT  <stdexcept>
-#  define STL_STRING     <string>
-#  define STL_STRSTREAM  <strstream>
-
 #  define SG_COMPILER_STR "Kai C++ version " SG_STRINGIZE(__KCC_VERSION)
-
 #endif // __KCC
 
 //
@@ -133,24 +59,8 @@
 //
 #ifdef _MSC_VER
 #  define bcopy(from, to, n) memcpy(to, from, n)
-#  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
 
 #  if _MSC_VER >= 1200  // msvc++ 6.0 or greater
-#    define SG_NAMESPACES
-#    define SG_HAVE_STD
-#    define SG_HAVE_STD_INCLUDES
-#    define SG_HAVE_STREAMBUF
-
-#    define STL_ALGORITHM  <algorithm>
-#    define STL_FUNCTIONAL <functional>
-#    define STL_IOMANIP    <iomanip>
-#    define STL_IOSTREAM   <iostream>
-#    define STL_ITERATOR   <iterator>
-#    define STL_FSTREAM    <fstream>
-#    define STL_STDEXCEPT  <stdexcept>
-#    define STL_STRING     <string>
-#    define STL_STRSTREAM  <strstream>
-
 #    define isnan _isnan
 #    define snprintf _snprintf
 #    define copysign _copysign
@@ -172,40 +82,18 @@
 //
 
 #if defined ( sgi ) && !defined( __GNUC__ )
-#  define SG_HAVE_NATIVE_SGI_COMPILERS
-
-#  define SG_EXPLICIT_FUNCTION_TMPL_ARGS
-#  define SG_CLASS_PARTIAL_SPECIALIZATION
-#  define SG_NEED_AUTO_PTR
-#  define SG_MEMBER_TEMPLATES
-#  define SG_NAMESPACES
-#  define SG_HAVE_STD
-#  define SG_HAVE_STREAMBUF
-#  define SG_HAVE_TRAITS
-#  define SG_HAVE_STD_INCLUDES
-
-#  define STL_ALGORITHM  <algorithm>
-#  define STL_FUNCTIONAL <functional>
-#  define STL_IOMANIP    <iomanip>
-#  define STL_IOSTREAM   <iostream>
-#  define STL_ITERATOR   <iterator>
-#  define STL_FSTREAM    <fstream>
-#  define STL_STDEXCEPT  <stdexcept>
-#if (_COMPILER_VERSION < 740)
-#  define STL_STRING     <irix_string>
-#else
-#  define STL_STRING     <string>
-#endif
-#  define STL_STRSTREAM  <strstream>
+# if (_COMPILER_VERSION < 740)
+#  error Need MipsPro 7.4.0 or higher now
+# endif
+
+#define SG_HAVE_NATIVE_SGI_COMPILERS
 
 #pragma set woff 1001,1012,1014,1116,1155,1172,1174
 #pragma set woff 1401,1460,1551,1552,1681
 
 #ifdef __cplusplus
-#pragma set woff 1682,3303
-#if (_COMPILER_VERSION >= 740)
-#  pragma set woff 3624
-#endif
+# pragma set woff 1682,3303
+# pragma set woff 3624
 #endif
 
 #  define SG_COMPILER_STR "SGI MipsPro compiler version " SG_STRINGIZE(_COMPILER_VERSION)
@@ -235,24 +123,7 @@
 // Intel C++ Compiler
 //
 #if defined(__ICC) || defined (__ECC)
-#  define SG_NAMESPACES
-#  define SG_HAVE_STD
-#  define SG_HAVE_STREAMBUF
-#  define SG_HAVE_TRAITS
-#  define SG_HAVE_STD_INCLUDES
-
-#  define STL_ALGORITHM  <algorithm>
-#  define STL_FUNCTIONAL <functional>
-#  define STL_IOMANIP    <iomanip>
-#  define STL_IOSTREAM   <iostream>
-#  define STL_ITERATOR   <iterator>
-#  define STL_FSTREAM    <fstream>
-#  define STL_STDEXCEPT  <stdexcept>
-#  define STL_STRING     <string>
-#  define STL_STRSTREAM  <strstream>
-
 #  define SG_COMPILER_STR "Intel C++ version " SG_STRINGIZE(__ICC)
-
 #endif // __ICC
 
 //
@@ -281,58 +152,10 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
 // No user modifiable definitions beyond here.
 //
 
-#ifdef SG_NEED_EXPLICIT
-#  define explicit
-#endif
-
-#ifdef SG_NEED_TYPENAME
-#  define typename
-#endif
-
-#ifdef SG_NEED_MUTABLE
-#  define mutable
-#endif
-
-#ifdef SG_NEED_BOOL
-   typedef int bool;
-#  define true 1
-#  define false 0
-#endif
-
-#ifdef SG_EXPLICIT_FUNCTION_TMPL_ARGS
-#  define SG_NULL_TMPL_ARGS <>
-#else
-#  define SG_NULL_TMPL_ARGS
-#endif
-
-#ifdef SG_CLASS_PARTIAL_SPECIALIZATION
-# define SG_TEMPLATE_NULL template<>
-#else
-# define SG_TEMPLATE_NULL
-#endif
-
-// SG_NO_NAMESPACES is a hook so that users can disable namespaces
-// without having to edit library headers.
-#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 SG_NAMESPACE(X)
-#   define SG_NAMESPACE_END
-#   define SG_USING_NAMESPACE(X)
-#endif
-
 /** \def SG_USING_STD(x)
- *  Expands to using std::x if SG_HAVE_STD is defined 
+ *  Expands to using std::X
  */
-# ifdef SG_HAVE_STD
 #  define SG_USING_STD(X) using std::X
-#  define STD std
-# else
-#  define SG_USING_STD(X) 
-#  define STD
-# endif
 
 #endif // _SG_COMPILER_H
 

diff --git a/simgear/constants.h b/simgear/constants.h
index 77f83011f196fd47e4e1feaeada4ff3241ea902b..df0fc8baa3e2d74870ec68551b087322090633d5 100644 (file)
--- a/simgear/constants.h
+++ b/simgear/constants.h
@@ -31,11 +31,8 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
+#include <cmath>
+
 
 #include <plib/sg.h>
 

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index 1b97803ee41ee3cbcbf4bf4ee3a778179fc83867..80f1892c11e86056688233153f24f110b915f956 100644 (file)
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -31,13 +31,8 @@
 #  include <windows.h>
 #endif
 
-#ifdef SG_HAVE_STD_INCLUDES
-# include <streambuf>
-# include <ostream>
-#else
-# include <iostream.h>
-# include <simgear/sg_traits.hxx>
-#endif
+#include <streambuf>
+#include <ostream>
 
 #include <simgear/debug/debug_types.h>
 
@@ -64,13 +59,6 @@ class logbuf : public std::streambuf
 #endif
 {
 public:
-
-#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;
-    // typedef char_traits<char>::off_type off_type;
-#endif
     // logbuf( streambuf* sb ) : sbuf(sb) {}
     /** Constructor */
     logbuf();
@@ -167,11 +155,7 @@ private:
 inline int
 logbuf::sync()
 {
-#ifdef SG_HAVE_STD_INCLUDES
        return sbuf->pubsync();
-#else
-       return sbuf->sync();
-#endif
 }
 
 inline void

diff --git a/simgear/environment/visual_enviro.hxx b/simgear/environment/visual_enviro.hxx
index 4ee2d7f39ec6f6fb65ad0094512670f0ab9bfb47..b5bec16339360456f0b747e1a0b573f429c86710 100644 (file)
--- a/simgear/environment/visual_enviro.hxx
+++ b/simgear/environment/visual_enviro.hxx
@@ -25,7 +25,7 @@
 #include <plib/sg.h>
 
 #include <simgear/compiler.h>
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(vector);

diff --git a/simgear/io/decode_binobj.cxx b/simgear/io/decode_binobj.cxx
index 2865db5700d5bad2d1ac269e9da85267f37cd92a..f2af87d88d058d9969bbb8fb464bc8c8a077eb8b 100644 (file)
--- a/simgear/io/decode_binobj.cxx
+++ b/simgear/io/decode_binobj.cxx
@@ -5,7 +5,7 @@
 #include <simgear/compiler.h>
 
 #include <unistd.h>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "sg_binobj.hxx"
 

diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx
index a0392a34bb17e758fd67464976173b08ab1e57e9..a81ca4679e4017abec52ae5677c6d796277336ca 100644 (file)
--- a/simgear/io/iochannel.hxx
+++ b/simgear/io/iochannel.hxx
@@ -32,7 +32,7 @@
 
 // #include "protocol.hxx"
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(vector);

diff --git a/simgear/io/lowtest.cxx b/simgear/io/lowtest.cxx
index b4bc0e046ad33d7e887f9d329e0813c1479faa1e..91113cb182831d3f6d1ecad8c14b8b57fb91013b 100644 (file)
--- a/simgear/io/lowtest.cxx
+++ b/simgear/io/lowtest.cxx
@@ -1,6 +1,6 @@
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 #include "lowlevel.hxx"
 
 

diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index 62e3fbe1c5219257edc863b9a07018e952895c33..692ee56abf26fabe94df0199f109337f7a93c333 100644 (file)
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -33,7 +33,7 @@
 #include <time.h>
 
 #include <vector>
-#include STL_STRING
+#include <string>
 #include <iostream>
 
 #include <simgear/bucket/newbucket.hxx>

diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx
index d5c108fc15f805e978bf59ec298aa1a76299868e..7fd5eb477b14f11d72207584527c081f8b12a66f 100644 (file)
--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -39,7 +39,7 @@
 #include <time.h>
 
 #include <list>
-#include STL_STRING
+#include <string>
 
 
 

diff --git a/simgear/io/sg_file.cxx b/simgear/io/sg_file.cxx
index 60d553cd10d36152962850e277aea7c020b41aab..df96aa8e80d68b243a27932356d6014938bff710 100644 (file)
--- a/simgear/io/sg_file.cxx
+++ b/simgear/io/sg_file.cxx
@@ -23,7 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #  include <io.h>

diff --git a/simgear/io/sg_serial.cxx b/simgear/io/sg_serial.cxx
index 8f06b82c428eaa71513ffdbc0d2b2c7387712ff2..e2e068f8d8c43acab23d29c3c474f5fb3b1a94fb 100644 (file)
--- a/simgear/io/sg_serial.cxx
+++ b/simgear/io/sg_serial.cxx
@@ -25,7 +25,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/serial/serial.hxx>

diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index b7c8553d0dd86ce38d782e9dc2a45bcecc761ca9..d1c22ab9d3ca2547d3ef09794eb4bd18c5710e79 100644 (file)
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -36,12 +36,6 @@
 
 #include <string>
 
-// #ifdef SG_HAVE_STD_INCLUDES
-// #  include <ctime>
-// #else
-// #  include <time.h>
-// #endif
-
 #include <simgear/serial/serial.hxx>
 
 #include "iochannel.hxx"

diff --git a/simgear/io/sg_socket.cxx b/simgear/io/sg_socket.cxx
index 433415dcfe1b42d98d8fd9aaf52bbede9124863e..8dcbd6bebd8c764d29b75f674b030cfb7343e544 100644 (file)
--- a/simgear/io/sg_socket.cxx
+++ b/simgear/io/sg_socket.cxx
@@ -31,7 +31,7 @@
 #include <strings.h>
 #endif
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include <simgear/debug/logstream.hxx>
 

diff --git a/simgear/io/sg_socket.hxx b/simgear/io/sg_socket.hxx
index f54e090dcd6150593d22473aca21fdcd7849449c..40ffde380373b32929f2741e0ab6ce0bb9c58960 100644 (file)
--- a/simgear/io/sg_socket.hxx
+++ b/simgear/io/sg_socket.hxx
@@ -34,7 +34,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/math/sg_types.hxx>
 #include <simgear/io/iochannel.hxx>

diff --git a/simgear/io/sg_socket_udp.hxx b/simgear/io/sg_socket_udp.hxx
index 731909afe6638fe585f674931bcb4f9b648fe5a1..d9006fe63a807a9cd56204361fa7a12a49d03b0f 100644 (file)
--- a/simgear/io/sg_socket_udp.hxx
+++ b/simgear/io/sg_socket_udp.hxx
@@ -36,7 +36,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/math/sg_types.hxx>
 #include <simgear/io/iochannel.hxx>

diff --git a/simgear/io/socktest.cxx b/simgear/io/socktest.cxx
index 1cd8f79f6d475f2fec5d0e198a5656cf6fa2161e..ed654981d481a095564f90d210d6048e53408e07 100644 (file)
--- a/simgear/io/socktest.cxx
+++ b/simgear/io/socktest.cxx
@@ -5,7 +5,7 @@
 #include <simgear/compiler.h>
 
 #include <unistd.h>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "sg_socket.hxx"
 #include "lowlevel.hxx"

diff --git a/simgear/io/tcp_client.cxx b/simgear/io/tcp_client.cxx
index dc9b171e270ef20467410488116b4d559ffd24e8..4bd9b945a54696273eca0325014e35c5f27c8f03 100644 (file)
--- a/simgear/io/tcp_client.cxx
+++ b/simgear/io/tcp_client.cxx
@@ -1,5 +1,5 @@
 #include <simgear/compiler.h>
-#include STL_IOSTREAM
+#include <iostream>
 
 #ifdef _WIN32
 #include <windows.h>

diff --git a/simgear/io/tcp_server.cxx b/simgear/io/tcp_server.cxx
index b0534937dab76b191db3540386ee188c71bbd47e..89161f53487e97e708b084f7392239f5e9733754 100644 (file)
--- a/simgear/io/tcp_server.cxx
+++ b/simgear/io/tcp_server.cxx
@@ -1,7 +1,7 @@
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
-#include STL_STRING
-#include STL_IOSTREAM
+#include <string>
+#include <iostream>
 
 #include "sg_socket.hxx"
 

diff --git a/simgear/magvar/coremag.cxx b/simgear/magvar/coremag.cxx
index e7b868d3ea578f9f6c02c292910320e936f2b395..e6d42c1d1a5bf45341a2b476c19ea31ee9913337 100644 (file)
--- a/simgear/magvar/coremag.cxx
+++ b/simgear/magvar/coremag.cxx
@@ -86,8 +86,6 @@
 
 #include "coremag.hxx"
 
-
-static const double pi = 3.14159265358979;
 static const double a = 6378.137;       /* semi-major axis (equatorial radius) of WGS84 ellipsoid */
 static const double b = 6356.7523142;   /* semi-minor axis referenced to the WGS84 ellipsoid */
 static const double r_0 = 6371.2;      /* standard Earth magnetic reference radius  */
@@ -325,7 +323,7 @@ double calc_magvar( double lat, double lon, double h, long dat, double* field )
     }
 
     /* Find geodetic field components: */
-    psi = theta - ((pi / 2.0) - lat);
+    psi = theta - ((M_PI / 2.0) - lat);
     sinpsi = sin(psi);
     cospsi = cos(psi);
     X = -B_theta * cospsi - B_r * sinpsi;

diff --git a/simgear/math/SGCMath.hxx b/simgear/math/SGCMath.hxx
index d6e22133acb55185ff86870e9dd8e17d145846bc..c5b4a3794a12422fcbfff4d73129eec9f709703b 100644 (file)
--- a/simgear/math/SGCMath.hxx
+++ b/simgear/math/SGCMath.hxx
@@ -20,12 +20,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-// We have cmath from the standard c++ lib available
 #include <cmath>
-#else
-// We only have math.h with the c89 double functions.
-#include <math.h>
-#endif
 
 #endif

diff --git a/simgear/math/SGMath.hxx b/simgear/math/SGMath.hxx
index 3770408ce6939e5439d7850ee9e7292884f4b468..d5fe3994305e2f4f5b2063af8ec4cdc764e857c7 100644 (file)
--- a/simgear/math/SGMath.hxx
+++ b/simgear/math/SGMath.hxx
@@ -22,8 +22,9 @@
 
 #include <iosfwd>
 // FIXME, make it compile on IRIX
-#include <osg/GL>
-#undef GLUT_APIENTRY_DEFINED // GL/glut.h undef APIENTRY when this symbol is defined. osg/GL defines it (?).
+
+//#include <osg/GL>
+//#undef GLUT_APIENTRY_DEFINED // GL/glut.h undef APIENTRY when this symbol is defined. osg/GL defines it (?).
                              // This probably would work if we didn't use plib/pu.h that include GL/glut.h 
                              //  on its side.
 

diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx
index 59caa2fcaa636b5ded7549d785f9e2fd1dec12fd..6502ba5a2f6bd8caaab8613a89442c7f0ce1acde 100644 (file)
--- a/simgear/math/interpolater.cxx
+++ b/simgear/math/interpolater.cxx
@@ -25,7 +25,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>

diff --git a/simgear/math/interpolater.hxx b/simgear/math/interpolater.hxx
index 797ddf4fcb3079bbc9b14053e830a436a4e1b1e3..06ed3832639f29bfe0c0fb886a046255d26e0150 100644 (file)
--- a/simgear/math/interpolater.hxx
+++ b/simgear/math/interpolater.hxx
@@ -39,7 +39,7 @@
 
 #include <map>
 
-#include STL_STRING
+#include <string>
 SG_USING_STD(string);
 
 class SGPropertyNode;

diff --git a/simgear/math/sg_types.hxx b/simgear/math/sg_types.hxx
index a1107f11d4b9e459996b9923b9c6d50a600bdf5a..e629a55a8539938986aa44bbf394ab9298d4d505 100644 (file)
--- a/simgear/math/sg_types.hxx
+++ b/simgear/math/sg_types.hxx
@@ -35,7 +35,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 #include <simgear/math/point3d.hxx>

diff --git a/simgear/misc/sg_path.hxx b/simgear/misc/sg_path.hxx
index a0636085507c0fb120c05c41c55f2aede3d55494..db3b300dc8bb2206f60a16bf1bc5152e6de64bfb 100644 (file)
--- a/simgear/misc/sg_path.hxx
+++ b/simgear/misc/sg_path.hxx
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 
 #include <simgear/compiler.h>
-#include STL_STRING
+#include <string>
 
 #include <simgear/math/sg_types.hxx>
 

diff --git a/simgear/misc/sgstream.cxx b/simgear/misc/sgstream.cxx
index ec758afbcf7798f4967bf4ee38a88b41dd32e857..6d5352c86ae2a6f1cefa845cd3d6cfb6df648318 100644 (file)
--- a/simgear/misc/sgstream.cxx
+++ b/simgear/misc/sgstream.cxx
@@ -21,15 +21,9 @@
 // $Id$
 
 #include <simgear/compiler.h>
-#include STL_STRING 
-
+#include <string>
 #include <ctype.h> // isspace()
-
-#ifdef SG_HAVE_STD_INCLUDES
-# include <cerrno>
-#else
-# include <errno.h>
-#endif
+#include <cerrno>
 
 #include "sgstream.hxx"
 

diff --git a/simgear/misc/sgstream.hxx b/simgear/misc/sgstream.hxx
index fc59471f4689c9578fad60a24a544acecca1a0eb..a0414b18fdbc03fb6b087555ecb09edd8a063a6c 100644 (file)
--- a/simgear/misc/sgstream.hxx
+++ b/simgear/misc/sgstream.hxx
@@ -35,7 +35,7 @@
 
 #  include <istream>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/misc/zfstream.hxx>
 

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index 05c559980357145d1a14d9d3bc84f7595b77b228..59051df40cb90050954341b071fe482e1510ef1f 100644 (file)
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -29,16 +29,12 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <vector>
 SG_USING_STD(vector);
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cstdlib>
-#else
-#  include <stdlib.h>
-#endif
+#include <cstdlib>
 
 SG_USING_STD(string);
 

diff --git a/simgear/misc/tabbed_values.hxx b/simgear/misc/tabbed_values.hxx
index a6dfdedafcaaf572fcaf23d69a267e4868e44310..cc7335f7f321d0b90ee85a6c3e8bc535f0765af5 100644 (file)
--- a/simgear/misc/tabbed_values.hxx
+++ b/simgear/misc/tabbed_values.hxx
@@ -26,7 +26,7 @@
 #include <simgear/compiler.h>
 
 #include <vector>
-#include STL_STRING
+#include <string>
 
 SG_USING_STD(vector);
 SG_USING_STD(string);

diff --git a/simgear/misc/tabbed_values_test.cxx b/simgear/misc/tabbed_values_test.cxx
index 0a5dfee0f2060c92e509bd5afe8fa52c50eb7c57..53bba88dafe5ce7ffb18b754bede306cc3cd9729 100644 (file)
--- a/simgear/misc/tabbed_values_test.cxx
+++ b/simgear/misc/tabbed_values_test.cxx
@@ -4,7 +4,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 #include "tabbed_values.hxx"
 
 SG_USING_STD(cout);

diff --git a/simgear/misc/texcoord.cxx b/simgear/misc/texcoord.cxx
index ea56ea9396879e85692b8ff04b1d96b8146348ee..afd0ceac6861b498e0a2455566fc0faece5ecf34 100644 (file)
--- a/simgear/misc/texcoord.cxx
+++ b/simgear/misc/texcoord.cxx
@@ -145,7 +145,7 @@ enter this in the official comments in case I forget again. :-)
 
 #include <simgear/compiler.h>
 
-// #include STL_IOSTREAM
+// #include <iostream>
 
 #include "texcoord.hxx"
 

diff --git a/simgear/misc/zfstream.cxx b/simgear/misc/zfstream.cxx
index 0df3c81037fc6e4b3ef2f4a316332a44453c20af..9ad2dd775dc316237f2f3dd1ca803e4639f110f8 100644 (file)
--- a/simgear/misc/zfstream.cxx
+++ b/simgear/misc/zfstream.cxx
@@ -23,11 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-# include <cerrno>
-#else
-# include <errno.h>
-#endif
+#include <cerrno>
 #include <memory.h>
 #include <stdio.h>
 

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index e4c1ff1f83237088d52ecf49d29c0630719d39c4..b6c0715ba1d73315e093773113c4a7d18d21d9c0 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -31,51 +31,20 @@
 
 #include <zlib.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
 
-#  include <streambuf>
-#  include <istream>
+#include <streambuf>
+#include <istream>
 
-#  define ios_openmode std::ios_base::openmode
-#  define ios_in       std::ios_base::in
-#  define ios_out      std::ios_base::out
-#  define ios_app      std::ios_base::app
-#  define ios_binary   std::ios_base::binary
+#define ios_openmode std::ios_base::openmode
+#define ios_in       std::ios_base::in
+#define ios_out      std::ios_base::out
+#define ios_app      std::ios_base::app
+#define ios_binary   std::ios_base::binary
 
-#  define ios_seekdir  std::ios_base::seekdir
+#define ios_seekdir  std::ios_base::seekdir
 
-#  define ios_badbit   std::ios_base::badbit
-#  define ios_failbit  std::ios_base::failbit
-
-#else
-
-#  ifdef SG_HAVE_STREAMBUF
-#    include <streambuf.h>
-#    include <istream.h>
-#  else
-#    include <iostream.h>
-#  endif
-
-//#  define ios_openmode ios::open_mode
-#  define ios_openmode int
-#  define ios_in       ios::in
-#  define ios_out      ios::out
-#  define ios_app      ios::app
-
-#if defined(__GNUC__) && __GNUC_MINOR__ < 8
-#  define ios_binary   ios::bin
-#else
-#  define ios_binary   ios::binary
-#endif
-
-#  define ios_seekdir  ios::seek_dir
-
-#  define ios_badbit   ios::badbit
-#  define ios_failbit  ios::failbit
-
-#  include <simgear/sg_traits.hxx>
-
-#endif // SG_HAVE_STD_INCLUDES
+#define ios_badbit   std::ios_base::badbit
+#define ios_failbit  std::ios_base::failbit
 
 /**
  * A C++ I/O streams interface to the zlib gz* functions.
@@ -87,14 +56,6 @@ class gzfilebuf : public std::streambuf
 #endif
 {
 public:
-
-#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;
-    // typedef char_traits<char>::off_type off_type;
-#endif
-
     /** Constructor */
     gzfilebuf();
 
@@ -135,12 +96,8 @@ public:
 protected:
 
     virtual int_type underflow();
-#ifndef SG_HAVE_STD_INCLUDES
-    virtual int_type overflow( int_type c = traits_type::eof() );
-#else
-    virtual int_type overflow( int_type c = std::streambuf::traits_type::eof() );
-#endif
 
+    virtual int_type overflow( int_type c = traits_type::eof() );
 private:
 
     int_type flushbuf();

diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx
index 54f5324f57af658cd0a501426399618c76753cf8..482197ce04d2691b1cb0de6bcb782a808c5c6716 100644 (file)
--- a/simgear/props/condition.cxx
+++ b/simgear/props/condition.cxx
@@ -11,7 +11,7 @@
 #  include <simgear/compiler.h>
 #endif
 
-// #include STL_IOSTREAM
+// #include <iostream>
 
 #include <simgear/structure/exception.hxx>
 

diff --git a/simgear/props/props_io.cxx b/simgear/props/props_io.cxx
index e080db56f160e5488107f934ba6d1bda18f46d85..b706c678c52e3c7c2d5b01e45f2b3464511b74a2 100644 (file)
--- a/simgear/props/props_io.cxx
+++ b/simgear/props/props_io.cxx
@@ -24,9 +24,9 @@
 #include "props.hxx"
 #include "props_io.hxx"
 
-#include STL_IOSTREAM
-#include STL_FSTREAM
-#include STL_STRING
+#include <iostream>
+#include <fstream>
+#include <string>
 #include <vector>
 #include <map>
 

diff --git a/simgear/props/props_io.hxx b/simgear/props/props_io.hxx
index d13f4d1fcf5e72127150c570131a25fa76eeb3e6..c8f46997207abeaabe2fc2812e30be8de5ae7dca 100644 (file)
--- a/simgear/props/props_io.hxx
+++ b/simgear/props/props_io.hxx
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 #include <map>
 #include <iosfwd>

diff --git a/simgear/props/props_test.cxx b/simgear/props/props_test.cxx
index c525e0b879fc3e2b20b458f2c7603bb9e91559c7..ccbf1afe951903fa2f7b9620cf07a6a95e0e4053 100644 (file)
--- a/simgear/props/props_test.cxx
+++ b/simgear/props/props_test.cxx
@@ -5,7 +5,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 #include "props.hxx"
 #include "props_io.hxx"
 

diff --git a/simgear/route/routetest.cxx b/simgear/route/routetest.cxx
index dc586c0afad3596866097157825976aea1fb4613..3a0b585310bba69bb7cb34dc7bec70ebdae52973 100644 (file)
--- a/simgear/route/routetest.cxx
+++ b/simgear/route/routetest.cxx
@@ -1,7 +1,7 @@
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "route.hxx"
 #include "waypoint.hxx"

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index 9c93314f3e7fd479a1f1f4c415ba617f9a4e6ab3..6f37fa566c65e733a9e1b1fe461c2f66710b9df2 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -35,7 +35,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 SG_USING_STD(string);
 

diff --git a/simgear/route/waytest.cxx b/simgear/route/waytest.cxx
index 0d57bff89fcef2ed47827b20b52206e20fa953b6..f3c428c9271cc244b07da5f40911e53d56455648 100644 (file)
--- a/simgear/route/waytest.cxx
+++ b/simgear/route/waytest.cxx
@@ -1,7 +1,7 @@
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "waypoint.hxx"
 

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index 6d0c89af58e245a40e19277b0247e06fb4161f5d..621f7940243c8d67c60bd2cefa105b689d3b5c21 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -32,7 +32,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING      // Standard C++ string library
+#include <string>      // Standard C++ string library
 #include <vector>
 #include <map>
 

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 6ef1be04db2ab094e3783cf329839106419f8e5f..2d6fddb85db8261f4c70a2fd990f318e0820b53a 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -40,7 +40,7 @@
 #include SG_GL_H
 
 #include <string.h>
-#include STL_STRING
+#include <string>
 
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
@@ -66,7 +66,6 @@
 
 #include "matlib.hxx"
 
-SG_USING_NAMESPACE(std);
 SG_USING_STD(string);
 
 // Constructor

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 3b1fb3189ec513f9d27a199be5b97e639d2e0956..9c96523b2460d03abcd2d518f3b1775edddd0c33 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -33,7 +33,7 @@
 
 #include <simgear/structure/SGSharedPtr.hxx>
 
-#include STL_STRING            // Standard C++ string library
+#include <string>              // Standard C++ string library
 #include <map>                 // STL associative "array"
 #include <vector>              // STL "array"
 

diff --git a/simgear/scene/material/matmodel.hxx b/simgear/scene/material/matmodel.hxx
index 363efec2b1aa0665d9add5eedf08ecdb7dfb7cfb..ac6856979c8c729cbd26c8933eae4385b8425aa7 100644 (file)
--- a/simgear/scene/material/matmodel.hxx
+++ b/simgear/scene/material/matmodel.hxx
@@ -30,7 +30,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING      // Standard C++ string library
+#include <string>      // Standard C++ string library
 #include <vector>
 
 #include <osg/ref_ptr>

diff --git a/simgear/scene/model/ModelRegistry.hxx b/simgear/scene/model/ModelRegistry.hxx
index 14231763f83ace872f2d3689d1a921d9632e01c3..229f75578280ad82212b05f6e374a290625b9b26 100644 (file)
--- a/simgear/scene/model/ModelRegistry.hxx
+++ b/simgear/scene/model/ModelRegistry.hxx
@@ -30,7 +30,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <map>
 
 // Class to register per file extension read callbacks with the OSG

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index b2d038ebefbed27023d20f68f610a50a9ee4c02c..806b7f23b51328ccf84702fe1ad9f89d63687543 100644 (file)
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -24,7 +24,7 @@
 
 #include <simgear/compiler.h>  // for SG_USING_STD
 
-#include STL_STRING
+#include <string>
 
 #include <osg/Node>
 

diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx
index 81c9e038b624622ae3fa8a6c61e45cf834197ea1..663ade3bd312f13af50088a10cea6cee021b4bfc 100644 (file)
--- a/simgear/scene/sky/cloud.hxx
+++ b/simgear/scene/sky/cloud.hxx
@@ -32,7 +32,7 @@
 #include <simgear/math/SGMath.hxx>
 #include <simgear/structure/SGReferenced.hxx>
 
-#include STL_STRING
+#include <string>
 SG_USING_STD(string);
 
 #include <osg/ref_ptr>

diff --git a/simgear/scene/sky/cloudfield.cxx b/simgear/scene/sky/cloudfield.cxx
index 8d83037d918d1d9a7b5565e408bb6b7aacca1cbb..2c048a97864343e4a6ca95f8bc250b36b1c1d75e 100644 (file)
--- a/simgear/scene/sky/cloudfield.cxx
+++ b/simgear/scene/sky/cloudfield.cxx
@@ -31,7 +31,7 @@
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/polar3d.hxx>
 
-#include STL_ALGORITHM
+#include <algorithm>
 #include <vector>
 
 SG_USING_STD(vector);

diff --git a/simgear/scene/sky/moon.cxx b/simgear/scene/sky/moon.cxx
index 211d96ca3107a5b5d5f7ffd780a8d7ac8bb023c1..ca4720966ece1d5a34242849dfee61001a8127e1 100644 (file)
--- a/simgear/scene/sky/moon.cxx
+++ b/simgear/scene/sky/moon.cxx
@@ -30,7 +30,7 @@
 #include <simgear/compiler.h>
 
 #include <stdio.h>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include <osg/Array>
 #include <osg/AlphaFunc>

diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx
index 901d0f78f23d08ecda6e5efb033e5bc30ba1ebad..d15b456109a90653f194e87b751137b2a2172c63 100644 (file)
--- a/simgear/scene/sky/newcloud.cxx
+++ b/simgear/scene/sky/newcloud.cxx
@@ -33,7 +33,7 @@
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/sg_path.hxx>
 
-#include STL_ALGORITHM
+#include <algorithm>
 #include SG_GLU_H
 
 #include "cloudfield.hxx"

diff --git a/simgear/scene/sky/newcloud.hxx b/simgear/scene/sky/newcloud.hxx
index 5ceb85cef06159ec906329c17335b2ba13b8c7fd..adda37eeef64a3065a88f077bb6d82f5162f4bc3 100644 (file)
--- a/simgear/scene/sky/newcloud.hxx
+++ b/simgear/scene/sky/newcloud.hxx
@@ -25,7 +25,7 @@
 
 #include <plib/sg.h>
 #include <simgear/compiler.h>
-#include STL_STRING
+#include <string>
 #include <vector>
 
 #include "bbcache.hxx"

diff --git a/simgear/scene/sky/sphere.cxx b/simgear/scene/sky/sphere.cxx
index 43d20e1c43b70767ef84ad837923838c17ce10fa..cee7ef415a11fc7660fd6e56928ae5753727b4b6 100644 (file)
--- a/simgear/scene/sky/sphere.cxx
+++ b/simgear/scene/sky/sphere.cxx
@@ -29,7 +29,7 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include <osg/Node>
 #include <osg/Geometry>

diff --git a/simgear/scene/sky/stars.cxx b/simgear/scene/sky/stars.cxx
index 55616f68837cf14e7c2ea43faad92bf804494acb..bc9cf07edf2460e7036bec238ee11b486aca895c 100644 (file)
--- a/simgear/scene/sky/stars.cxx
+++ b/simgear/scene/sky/stars.cxx
@@ -36,7 +36,7 @@
 #include <simgear/debug/logstream.hxx>
 
 #include <stdio.h>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>

diff --git a/simgear/scene/tgdb/TileCache.cxx b/simgear/scene/tgdb/TileCache.cxx
index f37533d23e623696005ce6824cfa0fd6afe9336f..4f0b8e3b49351060241334847d2d3072a4b1f647 100644 (file)
--- a/simgear/scene/tgdb/TileCache.cxx
+++ b/simgear/scene/tgdb/TileCache.cxx
@@ -31,8 +31,6 @@
 #include "TileEntry.hxx"
 #include "TileCache.hxx"
 
-SG_USING_NAMESPACE(std);
-
 using simgear::TileEntry;
 using simgear::TileCache;
 

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 2eb63a110927201a6210d50d491e15196726e1c0..79a1bf41a4fa8f363091b335d65692f08a826608 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -25,7 +25,7 @@
 #include <simgear/compiler.h>
 #include <plib/ul.h>
 
-#include STL_STRING
+#include <string>
 #include <sstream>
 #include <istream>
 

diff --git a/simgear/scene/tgdb/TileEntry.hxx b/simgear/scene/tgdb/TileEntry.hxx
index f47b89557fc67fdb859c4ea4c9e8f69f44453af2..cf0ffccc677fd2ca15febaa0e227ae9e34ed42d8 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.hxx
+++ b/simgear/scene/tgdb/TileEntry.hxx
@@ -32,7 +32,7 @@
 #include <simgear/compiler.h>
 
 #include <vector>
-#include STL_STRING
+#include <string>
 
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/math/point3d.hxx>

diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx
index dceccef7152bcba1f160409b775c584242b90b29..62282b410155ecb49909e55839fd666443c15df5 100644 (file)
--- a/simgear/scene/tgdb/apt_signs.hxx
+++ b/simgear/scene/tgdb/apt_signs.hxx
@@ -32,7 +32,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <osg/Node>
 

diff --git a/simgear/scene/tgdb/obj.hxx b/simgear/scene/tgdb/obj.hxx
index f35e2b369f9003524e6d118ba812097eb94eb824..d9b2075dee4b2b8f42c390a1104f9fe62cdea90b 100644 (file)
--- a/simgear/scene/tgdb/obj.hxx
+++ b/simgear/scene/tgdb/obj.hxx
@@ -31,7 +31,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <osg/Node>
 #include <osg/Group>

diff --git a/simgear/scene/tgdb/pt_lights.hxx b/simgear/scene/tgdb/pt_lights.hxx
index aeaa49b8bd225de81fdf1165250dd2bc625f1636..9e95674ed199b6f19856648ee47288a5902f9a80 100644 (file)
--- a/simgear/scene/tgdb/pt_lights.hxx
+++ b/simgear/scene/tgdb/pt_lights.hxx
@@ -31,7 +31,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>              // STL
 
 #include <osg/Drawable>

diff --git a/simgear/scene/tgdb/userdata.hxx b/simgear/scene/tgdb/userdata.hxx
index b487ddad329a7c8f8f0c0fb97e551608fbe1149e..5acf06a32eb893fd1e18d7d700569ff5776eb5a3 100644 (file)
--- a/simgear/scene/tgdb/userdata.hxx
+++ b/simgear/scene/tgdb/userdata.hxx
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <plib/sg.h>
 

diff --git a/simgear/screen/shader.h b/simgear/screen/shader.h
index 8a63643ede7436e8902e0a7b883197544ab58f96..df76790115385516ea2869d920828f877c666991 100644 (file)
--- a/simgear/screen/shader.h
+++ b/simgear/screen/shader.h
@@ -27,7 +27,7 @@
 #include <vector>
 
 #include <map>
-#include STL_STRING
+#include <string>
 
 SG_USING_STD(map);
 SG_USING_STD(vector);

diff --git a/simgear/serial/serial.cxx b/simgear/serial/serial.cxx
index 9e6c6163623501c79fdc11922aaa7b01169cefc3..2d273090803165e24ac4ebe7e599301a49f3b270 100644 (file)
--- a/simgear/serial/serial.cxx
+++ b/simgear/serial/serial.cxx
@@ -23,13 +23,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
-
-#ifdef SG_HAVE_STD_INCLUDE
-#  include <cerrno>
-#else
-#  include <errno.h>
-#endif
+#include <iostream>
+#include <cerrno>
 
 #if !defined( WIN32 ) || defined( __CYGWIN__) || defined( __CYGWIN32__ )
 #  include <termios.h>

diff --git a/simgear/serial/serial.hxx b/simgear/serial/serial.hxx
index 6441964ca1c8fbbf4ee8fc77685c583bc25453d8..d2c1f838cd8053f18e5151f83e09bb90d46370c0 100644 (file)
--- a/simgear/serial/serial.hxx
+++ b/simgear/serial/serial.hxx
@@ -37,7 +37,7 @@
 #endif
 
 #include <simgear/compiler.h>
-#include STL_STRING
+#include <string>
 SG_USING_STD(string);
 
 // if someone know how to do this all with C++ streams let me know

diff --git a/simgear/serial/testserial.cxx b/simgear/serial/testserial.cxx
index bc6b9c6a534d12675a61c46375a80ebb60a1f902..d82d993c039f36877a79c1fabf33e510f932f07f 100644 (file)
--- a/simgear/serial/testserial.cxx
+++ b/simgear/serial/testserial.cxx
@@ -1,7 +1,7 @@
 #include <simgear/compiler.h>
 
-#include STL_STRING
-#include STL_IOSTREAM
+#include <string>
+#include <iostream>
 
 #include <simgear/debug/logstream.hxx>
 

diff --git a/simgear/sg_traits.hxx b/simgear/sg_traits.hxx
deleted file mode 100644 (file)
index 500f739..0000000
--- a/simgear/sg_traits.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/** \file sg_traits.hxx
- * Provides a char_traits declaration for systems without it.
- * \internal
- */
-
-#ifndef _SG_TRAITS_HXX
-#define _SG_TRAITS_HXX
-
-#include <simgear/compiler.h>
-
-#ifndef SG_HAVE_TRAITS
-
-// Dummy up some char traits for now.
-template<class charT> struct char_traits{};
-
-SG_TEMPLATE_NULL
-struct char_traits<char>
-{
-    typedef char      char_type;
-    typedef int       int_type;
-    typedef streampos pos_type;
-    typedef streamoff off_type;
-
-    static int_type eof() { return EOF; }
-};
-#endif // SG_HAVE_TRAITS
-
-#endif // _SG_TRAITS_HXX

diff --git a/simgear/sound/sample_openal.hxx b/simgear/sound/sample_openal.hxx
index 7e8693e336cf7a8bacd1e7e6dfb433bef9b79306..2653931d295788b976ed154e3dcb1cfe7c16072e 100644 (file)
--- a/simgear/sound/sample_openal.hxx
+++ b/simgear/sound/sample_openal.hxx
@@ -34,7 +34,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/SGReferenced.hxx>

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index 0d59961e17bb225b5fa8dec2fff5da3a265049d9..e53eccaccddf42eb5dd614ac627a9e1510ab1b8b 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -68,7 +68,7 @@ extern "C" int isinf (double);
 #endif
 
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>

diff --git a/simgear/sound/soundmgr_openal.hxx b/simgear/sound/soundmgr_openal.hxx
index 567dadf939665d09cb5a304b85b3ebe2dbb12f2d..d306f82e7d43fcefb16bdf638896f136e47a7c05 100644 (file)
--- a/simgear/sound/soundmgr_openal.hxx
+++ b/simgear/sound/soundmgr_openal.hxx
@@ -39,7 +39,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <map>
 
 #if defined( __APPLE__ )

diff --git a/simgear/structure/commands.hxx b/simgear/structure/commands.hxx
index fa27ac7e8a66bd726d42e2ad916cd116798b0bd4..147c4f3de0f9bb383fc14ee3334e6e2981238123 100644 (file)
--- a/simgear/structure/commands.hxx
+++ b/simgear/structure/commands.hxx
@@ -13,7 +13,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <map>
 #include <vector>
 

diff --git a/simgear/structure/exception.hxx b/simgear/structure/exception.hxx
index 9de8ea8c6a9327caf9e9e683d41fbee8a106cab1..e482be310ebe2faf45a37931b4a591525a695742 100644 (file)
--- a/simgear/structure/exception.hxx
+++ b/simgear/structure/exception.hxx
@@ -11,7 +11,7 @@
 #define __SIMGEAR_MISC_EXCEPTION_HXX 1
 
 #include <simgear/compiler.h>
-#include STL_STRING
+#include <string>
 
 SG_USING_STD(string);
 

diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx
index 996846f9f3f62902e0ad91882a4f64b2e6bd69e1..171e4665d4515705bab7c6274231d9148fa4fc23 100644 (file)
--- a/simgear/structure/subsystem_mgr.hxx
+++ b/simgear/structure/subsystem_mgr.hxx
@@ -31,7 +31,7 @@
 #  include <float.h>
 #endif
 
-#include STL_STRING
+#include <string>
 SG_USING_STD(string);
 
 #include <vector>

diff --git a/simgear/threads/SGQueue.hxx b/simgear/threads/SGQueue.hxx
index 9f534ec909a34e53b01e99c0e8f42b85fcaa0989..41bd3272b2b0d8ba3d4757d33ef71510cf9c8902 100644 (file)
--- a/simgear/threads/SGQueue.hxx
+++ b/simgear/threads/SGQueue.hxx
@@ -3,12 +3,7 @@
 
 #include <simgear/compiler.h>
 
-#if defined ( SG_HAVE_STD_INCLUDES )
-#  include <cassert>
-#else
-#  include <assert.h>
-#endif
-
+#include <cassert>
 #include <queue>
 #include "SGThread.hxx"
 #include "SGGuard.hxx"

diff --git a/simgear/threads/SGThread.hxx b/simgear/threads/SGThread.hxx
index 5179ab80cb02f01715c5bfe2604180fce68637a1..477ca458f354b6f10807e766a00aa3f006386b1d 100644 (file)
--- a/simgear/threads/SGThread.hxx
+++ b/simgear/threads/SGThread.hxx
@@ -26,13 +26,8 @@
 #include <simgear/compiler.h>
 
 #include <pthread.h>
-#if defined ( SG_HAVE_STD_INCLUDES )
-#  include <cassert>
-#  include <cerrno>
-#else
-#  include <assert.h>
-#  include <sys/errno.h>
-#endif
+#include <cassert>
+#include <cerrno>
 
 class SGThread;
 

diff --git a/simgear/timing/geocoord.h b/simgear/timing/geocoord.h
index 956e1189f1ca4b778fbee390192d28d35d45d229..536cf0f95ca2fe7707d631d05636eb24e09d94bd 100644 (file)
--- a/simgear/timing/geocoord.h
+++ b/simgear/timing/geocoord.h
@@ -38,8 +38,6 @@
 #include <math.h>
 #include <vector>
 
-SG_USING_NAMESPACE(std);
-
 #include <simgear/constants.h>
 
 class SGGeoCoord
@@ -65,9 +63,9 @@ public:
   virtual const char * getDescription() {return 0;};
 };
 
-typedef vector<SGGeoCoord*> SGGeoCoordVector;
-typedef vector<SGGeoCoord*>::iterator SGGeoCoordVectorIterator;
-typedef vector<SGGeoCoord*>::const_iterator SGGeoCoordVectorConstIterator;
+typedef std::vector<SGGeoCoord*> SGGeoCoordVector;
+typedef std::vector<SGGeoCoord*>::iterator SGGeoCoordVectorIterator;
+typedef std::vector<SGGeoCoord*>::const_iterator SGGeoCoordVectorConstIterator;
 
 /************************************************************************
  * SGGeoCoordContainer is a simple container class, that stores objects

diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
index 33777a572e495f49bea29209fa12bbf8251bc028..fb3f30c81c19ee5283e0737658f058c9a522879d 100644 (file)
--- a/simgear/timing/sg_time.cxx
+++ b/simgear/timing/sg_time.cxx
@@ -29,15 +29,9 @@
 
 #include <errno.h>             // for errno
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cstdio>
-#  include <cstdlib>
-#  include <ctime>
-#else
-#  include <math.h>
-#  include <stdio.h>
-#  include <stdlib.h>
-#endif
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 
 #include <string>
 

diff --git a/simgear/timing/sg_time.hxx b/simgear/timing/sg_time.hxx
index 0ec0138b8a7ae369e45ef107a83583a6b916083e..680c161134682a813c5cca24fb9379dce7c227de 100644 (file)
--- a/simgear/timing/sg_time.hxx
+++ b/simgear/timing/sg_time.hxx
@@ -35,11 +35,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <ctime>
-#else
-#  include <time.h>
-#endif
+#include <ctime>
 
 #include <simgear/timing/timezone.h>
 
@@ -71,7 +67,7 @@ private:
     SGTimeZoneContainer* tzContainer;
 
     // Points to the current local timezone name;
-    string zonename;
+    std::string zonename;
 
     // Unix "calendar" time in seconds
     time_t cur_time;
@@ -104,7 +100,7 @@ private:
     double gst_diff;
 
     /** init common constructor code */
-    void init( double lon_rad, double lat_rad, const string& root,
+    void init( double lon_rad, double lat_rad, const std::string& root,
                time_t init_time );
 
 public:
@@ -128,14 +124,14 @@ public:
      * @param root root path point to data file location (timezone, etc.)
      * @param init_time provide an initialization time, 0 means use
               current clock time */
-    SGTime( double lon_rad, double lat_rad, const string& root,
+    SGTime( double lon_rad, double lat_rad, const std::string& root,
             time_t init_time );
 
     /**
      * Create an instance given a data file path.
      * @param root root path point to data file location (timezone, etc.)
      */
-    SGTime( const string& root );
+    SGTime( const std::string& root );
 
     /** Destructor */
     ~SGTime();
@@ -165,7 +161,7 @@ public:
      * @param lon_rad current longitude (radians)
      * @param lat_rad current latitude (radians)
      * @param root base path containing time zone directory */
-    void updateLocal( double lon_rad, double lat_rad, const string& root );
+    void updateLocal( double lon_rad, double lat_rad, const std::string& root );
 
     /** @return current system/unix time in seconds */
     inline time_t get_cur_time() const { return cur_time; };

diff --git a/simgear/timing/timestamp.cxx b/simgear/timing/timestamp.cxx
index dcda28ec9e7265cb8e577f6e26cc273f94ccd2af..458502ea2516f4cae61b59dc0c8c6d995f63f410 100644 (file)
--- a/simgear/timing/timestamp.cxx
+++ b/simgear/timing/timestamp.cxx
@@ -34,11 +34,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <ctime>
-#else
-#  include <time.h>
-#endif
+#include <ctime>
 
 #ifdef HAVE_SYS_TIMEB_H
 #  include <sys/timeb.h> // for ftime() and struct timeb

diff --git a/simgear/timing/timezone.h b/simgear/timing/timezone.h
index aa282b546ca5196d616c5ae667d58989298072e5..f5779fd374aca1f50c5aa5116f28840c90841e91 100644 (file)
--- a/simgear/timing/timezone.h
+++ b/simgear/timing/timezone.h
@@ -44,8 +44,8 @@ class SGTimeZone : public SGGeoCoord
 
 private:
 
-  string countryCode;
-  string descriptor;
+  std::string countryCode;
+  std::string descriptor;
 
 public:
 

diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
index 0aa71b18612cb3af5a814564785f2ebf0bde5ab2..0779d872b38e9120a52cdb13db5e5dd1887f5590 100644 (file)
--- a/simgear/xml/easyxml.cxx
+++ b/simgear/xml/easyxml.cxx
@@ -11,8 +11,8 @@
 #include "easyxml.hxx"
 #include "xmlparse.h"
 
-#include STL_FSTREAM
-#include STL_IOSTREAM
+#include <fstream>
+#include <iostream>
 
 SG_USING_STD(ifstream);
 

diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index 6b91a86718efb30602d4adccbe1d294330bf7705..d59d371b0022e413937d1ce77f23f9fb4170a0d6 100644 (file)
--- a/simgear/xml/easyxml.hxx
+++ b/simgear/xml/easyxml.hxx
@@ -11,8 +11,8 @@
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
 
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <vector>
 
 SG_USING_STD(istream);