Yank the MSVC special handling. It turns out it was becuase "strlen"

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index a709b9011664b423f1d509c2c6333ecf6640d27e..824c9024cf2d9187fafbcc49c1a36e78111b1027 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -308,7 +308,7 @@
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
 #if (_COMPILER_VERSION < 740)
-#  define STL_STRING     <simgear/compatibility/irix_string>
+#  define STL_STRING     <irix_string>
 #else
 #  define STL_STRING     <string>
 #endif
@@ -319,6 +319,9 @@
 
 #ifdef __cplusplus
 #pragma set woff 1682,3303
+#if (_COMPILER_VERSION >= 740)
+#  pragma set woff 3624
+#endif
 #endif
 
 #  define SG_COMPILER_STR "SGI MipsPro compiler version " SG_STRINGIZE(_COMPILER_VERSION)