Go with an all white texture for vasi/papi lights. We will vary the

[simgear.git] / simgear / compiler.h

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