diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp index 6d2e0123..7d9d372d 100644 --- a/include/boost/config/compiler/intel.hpp +++ b/include/boost/config/compiler/intel.hpp @@ -17,11 +17,16 @@ # define BOOST_INTEL_CXX_VERSION __ICC #endif +#if (BOOST_INTEL_CXX_VERSION <= 500) && defined(_MSC_VER) +# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS +#endif + #if (BOOST_INTEL_CXX_VERSION <= 600) || !defined(BOOST_STRICT_CONFIG) # if defined(_MSC_VER) // Intel C++ 5.0.1 uses EDG 2.45, but fails to activate Koenig lookup - // in the frontend even in "strict" mode. (reported by Kirk Klobe) + // in the frontend even in "strict" mode, unless you use + // -Qoption,cpp,--arg_dep_lookup.. (reported by Kirk Klobe & Thomas Witt) // Intel C++ 6.0 (currently in Beta test) doesn't have any front-end // changes at all. (reported by Kirk Klobe) # ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP @@ -59,3 +64,4 @@ #endif +