[boost] Re: Intel: different macros for Windows and Linux

From: Stefan Slapeta (stefan_at_[hidden])
Date: 2004-08-18 05:29:15

Small change - Itanium (_WIN64) should be included.

Furthermore, I would like to increase the value for supported compilers 
versions to 810 to make 8.1 beta running.

Stefan

Stefan Slapeta wrote:

> 
> I would like to introduce different config macros for the windows and 
> linux version of ICL which should be defined like BOOST_INTEL. The names 
> should be BOOST_INTEL_WIN and BOOST_INTEL_LINUX.
> 
> It's just to improve the control over the completely different front 
> ends of these compilers.... (actually they are two different compilers. 
> In many cases it doesn't make sense to make behaviour dependent on "the" 
> Intel compiler!)
> 
> OK to commit?
> 
> Stefan
> 


--- intel.hpp	29 Jun 2004 10:19:27 -0000	1.36
+++ intel.hpp	18 Aug 2004 10:26:54 -0000
@@ -29,6 +29,12 @@
 #define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION)
 #define BOOST_INTEL BOOST_INTEL_CXX_VERSION
 
+#if defined(_WIN32) || defined(_WIN64)
+#  define BOOST_INTEL_WIN BOOST_INTEL
+#else
+#  define BOOST_INTEL_LINUX BOOST_INTEL
+#endif
+
 #if (BOOST_INTEL_CXX_VERSION <= 500) && defined(_MSC_VER)
 #  define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
 #  define BOOST_NO_TEMPLATE_TEMPLATES
@@ -131,7 +137,7 @@
 #endif
 //
 // last known and checked version:
-#if (BOOST_INTEL_CXX_VERSION > 800)
+#if (BOOST_INTEL_CXX_VERSION > 810)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  elif defined(_MSC_VER)