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 f80697d549d58c52a91e5a3f959249fad94253d0..824c9024cf2d9187fafbcc49c1a36e78111b1027 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -307,7 +307,11 @@
 #  define STL_ITERATOR   <iterator>
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
-#  define STL_STRING     <simgear/compatibility/irix_string>
+#if (_COMPILER_VERSION < 740)
+#  define STL_STRING     <irix_string>
+#else
+#  define STL_STRING     <string>
+#endif
 #  define STL_STRSTREAM  <strstream>
 
 #pragma set woff 1001,1012,1014,1116,1155,1172,1174
@@ -315,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)