Index: boost/config/select_compiler_config.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/config/select_compiler_config.hpp,v
retrieving revision 1.4
diff -u -r1.4 select_compiler_config.hpp
--- boost/config/select_compiler_config.hpp	23 Feb 2002 12:57:54 -0000	1.4
+++ boost/config/select_compiler_config.hpp	20 May 2003 08:48:04 -0000
@@ -38,7 +38,7 @@
 //  Borland
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp"
 
-#elif defined(__ICL) || defined(__ICC)
+#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
 //  Intel
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"
 
Index: boost/config/compiler/intel.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/config/compiler/intel.hpp,v
retrieving revision 1.21
diff -u -r1.21 intel.hpp
--- boost/config/compiler/intel.hpp	8 May 2003 11:38:31 -0000	1.21
+++ boost/config/compiler/intel.hpp	20 May 2003 08:48:04 -0000
@@ -9,13 +9,18 @@
 
 #include "boost/config/compiler/common_edg.hpp"
 
-#ifdef __ICL
-#  define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(__ICL)
+#if defined(__INTEL_COMPILER)
+#  define BOOST_INTEL_CXX_VERSION __INTEL_COMPILER
+#elif defined(__ICL)
 #  define BOOST_INTEL_CXX_VERSION __ICL
-#else
-#  define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(__ICC)
+#elif defined(__ICC)
 #  define BOOST_INTEL_CXX_VERSION __ICC
+#elif defined(__ECC)
+#  define BOOST_INTEL_CXX_VERSION __ECC
 #endif
+
+#define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION)
+#define BOOST_INTEL BOOST_INTEL_CXX_VERSION
 
 #if (BOOST_INTEL_CXX_VERSION <= 500) && defined(_MSC_VER)
 #  define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
Index: boost/regex/config.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/regex/config.hpp,v
retrieving revision 1.27
diff -u -r1.27 config.hpp
--- boost/regex/config.hpp	17 May 2003 11:45:43 -0000	1.27
+++ boost/regex/config.hpp	20 May 2003 08:48:08 -0000
@@ -130,7 +130,7 @@
 
 // We don't make our templates external if the compiler
 // can't handle it:
-#if (defined(BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS) || defined(__HP_aCC) || defined(__MWERKS__) || defined(__COMO__) || defined(__ICL) || defined(__ICC))\
+#if (defined(BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS) || defined(__HP_aCC) || defined(__MWERKS__) || defined(__COMO__) || defined(BOOST_INTEL))\
    && !defined(BOOST_MSVC) && !defined(__BORLANDC__)
 #  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
 #endif
Index: libs/config/config.htm
===================================================================
RCS file: /cvsroot/boost/boost/libs/config/config.htm,v
retrieving revision 1.23
diff -u -r1.23 config.htm
--- libs/config/config.htm	9 Jan 2003 12:30:58 -0000	1.23
+++ libs/config/config.htm	20 May 2003 08:48:11 -0000
@@ -1170,6 +1170,12 @@
         compilers that also define _MSC_VER.</td>
     </tr>
     <tr>
+        <td valign="top">BOOST_INTEL</td>
+        <td valign="top">&lt;boost/config.hpp&gt;</td>
+        <td valign="top">Defined if the compiler is an Intel compiler,
+        takes the same value as the compiler version macro.</td>
+    </tr>
+    <tr>
         <td>BOOST_DINKUMWARE_STDLIB</td>
         <td>&lt;boost/config.hpp&gt;</td>
         <td>Defined if the dinkumware standard library is in use,
Index: libs/config/test/config_info.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/config/test/config_info.cpp,v
retrieving revision 1.30
diff -u -r1.30 config_info.cpp
--- libs/config/test/config_info.cpp	17 May 2003 11:41:11 -0000	1.30
+++ libs/config/test/config_info.cpp	20 May 2003 08:48:13 -0000
@@ -260,6 +260,7 @@
   // misc compilers not covered so far:
   PRINT_MACRO(__ICC);
   PRINT_MACRO(__ICL);
+  PRINT_MACRO(__ECC);
   PRINT_MACRO(__INTEL_COMPILER);
   PRINT_MACRO(__USLC__);
   PRINT_MACRO(__DECCXX);
@@ -867,6 +868,7 @@
    PRINT_MACRO(BOOST_HAS_TWO_ARG_USE_FACET);
    PRINT_MACRO(BOOST_HAS_UNISTD_H);
    PRINT_MACRO(BOOST_HAS_WINTHREADS);
+   PRINT_MACRO(BOOST_INTEL);
    PRINT_MACRO(BOOST_MSVC);
    PRINT_MACRO(BOOST_MSVC_STD_ITERATOR);
    PRINT_MACRO(BOOST_MSVC6_MEMBER_TEMPLATES);
Index: libs/type_traits/test/test.hpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/type_traits/test/test.hpp,v
retrieving revision 1.5
diff -u -r1.5 test.hpp
--- libs/type_traits/test/test.hpp	18 May 2003 11:12:24 -0000	1.5
+++ libs/type_traits/test/test.hpp	20 May 2003 08:48:23 -0000
@@ -126,7 +126,7 @@
 # ifdef BOOST_MSVC
 #  pragma warning(push)
 #  pragma warning(disable: 4181)
-# elif defined(__ICL) || defined(__ICC)
+# elif defined(BOOST_INTEL)
 #  pragma warning(push)
 #  pragma warning(disable: 21)
 # endif
@@ -141,7 +141,7 @@
 typedef const r_type cr_type;
 # ifdef BOOST_MSVC
 #  pragma warning(pop)
-# elif defined(__ICL) || defined(__ICC)
+# elif defined(BOOST_INTEL)
 #  pragma warning(pop)
 #  pragma warning(disable: 985) // identifier truncated in debug information
 # endif