Misc Irix tweaks.

diff --git a/simgear/compiler.h b/simgear/compiler.h
index bb7e830357782455c2c213c45c670655ba9b7eda..86c7ee8cde6fcd54046eef5507a5401e834bf4aa 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -283,10 +283,14 @@
 #  define STL_STRING     <string>
 #  define STL_STRSTREAM  <strstream.h>
 
-#  define __STL_FUNCTION_TMPL_PARTIAL_ORDER
+// #  define __STL_FUNCTION_TMPL_PARTIAL_ORDER
 
-#pragma set woff 1001,1012,1014,1116,1172,1174,1401,146,0
-#pragma set woff 1551,1552,1681
+#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
+#endif
 
 #endif // Native SGI compilers
 

diff --git a/simgear/misc/exception.cxx b/simgear/misc/exception.cxx
index f67bc35228d4a1f7ed537051f90ddaa59f46106d..75f4cf50d0368853b48c7ea2bd9d63a400556caf 100644 (file)
--- a/simgear/misc/exception.cxx
+++ b/simgear/misc/exception.cxx
@@ -86,7 +86,7 @@ sg_location::asString () const
 {
   char buf[128];
   string out = "";
-  if (_path != "") {
+  if (_path != (string)"") {
     out += _path;
     if (_line != -1 || _column != -1)
       out += ",\n";

diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
index 181e646ba3d7a9d45d07ee7a1ea7409aa9cd2717..c1aed18528c2635465e676fbccd8371d3fa0ef6c 100644 (file)
--- a/simgear/xml/easyxml.cxx
+++ b/simgear/xml/easyxml.cxx
@@ -9,7 +9,9 @@
 
 #include STL_FSTREAM
 
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
+#endif
 
 
 \f