Rename IRIX to irix_string in simgear/compatibility and assign "simgear/compatibility...

diff --git a/simgear/compatibility/IRIX b/simgear/compatibility/IRIX
deleted file mode 100644 (file)
index 1711739..0000000
--- a/simgear/compatibility/IRIX
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#ifndef __SGI_HXX
-#define __SGI_HXX
-
-#include <string>
-
-inline bool
-operator!=( const std::string& lhs, const char* rhs)
-{
-    return lhs.compare( rhs ) != 0;
-}
-
-inline bool
-operator!=( const char* lhs, const std::string& rhs)
-{
-    return rhs.compare( lhs ) != 0;
-}
-
-inline bool
-operator==( const std::string& lhs, const char* rhs)
-{
-    return lhs.compare( rhs ) == 0;
-}
-
-inline bool
-operator==( const char* lhs, const std::string& rhs)
-{
-    return rhs.compare( lhs ) == 0;
-}
-
-inline std::string
-operator+(const std::string& lhs, const char* rhs)
-{
-    return lhs + std::string(rhs);
-}
-
-inline std::string
-operator+(const char* lhs, const std::string& rhs)
-{
-    return std::string(lhs) + rhs;
-}
-
-#endif // !__SGI_HXX

diff --git a/simgear/compatibility/Makefile.am b/simgear/compatibility/Makefile.am
index 7cdc91e4bf86fd2bcb4b173238962ef56a9b9db2..404ebfc79894b7580858a79605777c01c5d34765 100644 (file)
--- a/simgear/compatibility/Makefile.am
+++ b/simgear/compatibility/Makefile.am
@@ -30,4 +30,4 @@ include_HEADERS       = \
        new \
        streambuf \
        \
-       IRIX
+       irix_string

diff --git a/simgear/compatibility/irix_string b/simgear/compatibility/irix_string
new file mode 100644 (file)
index 0000000..1b49dd7
--- /dev/null
+++ b/simgear/compatibility/irix_string
@@ -0,0 +1,47 @@
+
+#ifndef __SGI_HXX
+#define __SGI_HXX 1
+
+#ifdef __cplusplus
+
+#include <string>
+
+inline bool
+operator!=( const std::string& lhs, const char* rhs)
+{
+    return lhs.compare( rhs ) != 0;
+}
+
+inline bool
+operator!=( const char* lhs, const std::string& rhs)
+{
+    return rhs.compare( lhs ) != 0;
+}
+
+inline bool
+operator==( const std::string& lhs, const char* rhs)
+{
+    return lhs.compare( rhs ) == 0;
+}
+
+inline bool
+operator==( const char* lhs, const std::string& rhs)
+{
+    return rhs.compare( lhs ) == 0;
+}
+
+inline std::string
+operator+(const std::string& lhs, const char* rhs)
+{
+    return lhs + std::string(rhs);
+}
+
+inline std::string
+operator+(const char* lhs, const std::string& rhs)
+{
+    return std::string(lhs) + rhs;
+}
+
+#endif /* __cplusplus */
+
+#endif /* !__SGI_HXX */

diff --git a/simgear/compiler.h b/simgear/compiler.h
index d28732303e8a83f733d346fc9ef80ccfd4efe1b4..f80697d549d58c52a91e5a3f959249fad94253d0 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -290,8 +290,6 @@
 #if defined ( sgi ) && !defined( __GNUC__ )
 #  define SG_HAVE_NATIVE_SGI_COMPILERS
 
-#include <simgear/compatibility/IRIX>
-
 #  define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #  define SG_CLASS_PARTIAL_SPECIALIZATION
 #  define SG_NEED_AUTO_PTR
@@ -309,7 +307,7 @@
 #  define STL_ITERATOR   <iterator>
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
-#  define STL_STRING     <string>
+#  define STL_STRING     <simgear/compatibility/irix_string>
 #  define STL_STRSTREAM  <strstream>
 
 #pragma set woff 1001,1012,1014,1116,1155,1172,1174

diff --git a/simgear/misc/tabbed_values.hxx b/simgear/misc/tabbed_values.hxx
index 895e62b88e7ddfa448a192ba86aa689807e2cbe7..c66d306bdd68c51e3006fc46a5b4b44e8b605ee1 100644 (file)
--- a/simgear/misc/tabbed_values.hxx
+++ b/simgear/misc/tabbed_values.hxx
@@ -1,10 +1,10 @@
 #ifndef SG_TABBED_VALUES_HXX
 #define SG_TABBED_VALUES_HXX
 
-#include <vector>
-#include <string>
+#include <simgear/compiler.h>
 
-#include "simgear/compiler.h"
+#include <vector>
+#include STL_STRING
 
 SG_USING_STD(vector);
 SG_USING_STD(string);