Fixes for 0.3.1 release.

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 41b43c48b21d0d38547ea3d215dbadd9a2de0c55..4a40c9fc15af015acebde2a91f9d1f779bd19858 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -141,7 +141,6 @@
 #      define STL_STDEXCEPT  <stdexcept>
 #      define STL_STRING     <string>
 #      define STL_STRSTREAM  <strstream>
-
 #  else
 #    error Time to upgrade. GNU compilers < 2.7 not supported
 #  endif
@@ -153,6 +152,7 @@
 #if defined( __MINGW32__ )
 #  define bcopy(from, to, n) memcpy(to, from, n)
 #  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
+#  define snprintf _snprintf
 #endif
 
 /* KAI C++ */
@@ -235,18 +235,7 @@
 #    define STL_STRING     <string>
 #    define STL_STRSTREAM  <strstream>
 
-#    define SG_NO_INCLASS_MEMBER_INITIALIZATION
-
-// disable min/max macros if defined:
-// #    ifdef min
-// #      undef min
-// #    endif
-// #    ifdef max
-// #      undef max
-// #    endif
-// #    ifndef NOMINMAX
-// #      define NOMINMAX
-// #    endif
+#    define snprintf _snprintf
 
 #    pragma warning(disable: 4786) // identifier was truncated to '255' characters
 #    pragma warning(disable: 4244) // conversion from double to float
@@ -356,7 +345,7 @@
 //
 // Intel C++ Compiler
 //
-#if defined(__ICC)
+#if defined(__ICC) || defined (__ECC)
 #  define SG_NAMESPACES
 #  define SG_HAVE_STD
 #  define SG_HAVE_STREAMBUF
@@ -457,17 +446,4 @@ inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const)
 
 #endif // SG_INCOMPLETE_FUNCTIONAL
 
-/**
- * SG_STATIC_CONSTANT workaround.
- * On compilers which don't allow in-class initialization of static integral
- * constant members, we must use enums as a workaround if we want the constants
- * to be available at compile-time. This macro gives us a convenient way to
- * declare such constants.
- */
-#ifdef SG_NO_INCLASS_MEMBER_INITIALIZATION
-#  define SG_STATIC_CONST(type,assignment) enum { assignment }
-#else
-#  define SG_STATIC_CONST(type,assignment) static const type assignment
-#endif
-
 #endif // _SG_COMPILER_H