Subject: [Boost-commit] svn:boost r76324 - trunk/boost/regex/v4
From: john_at_[hidden]
Date: 2012-01-05 12:31:35
Author: johnmaddock
Date: 2012-01-05 12:31:34 EST (Thu, 05 Jan 2012)
New Revision: 76324
URL: http://svn.boost.org/trac/boost/changeset/76324
Log:
Fix pp-logic.
Refs #6359.
Text files modified:
trunk/boost/regex/v4/regex_format.hpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Modified: trunk/boost/regex/v4/regex_format.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_format.hpp (original)
+++ trunk/boost/regex/v4/regex_format.hpp 2012-01-05 12:31:34 EST (Thu, 05 Jan 2012)
@@ -180,7 +180,7 @@
}
inline int toi(ForwardIter& i, ForwardIter j, int base)
{
-#if defined(_MSC_VER) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 9999)
+#if defined(_MSC_VER) && defined(__INTEL_COMPILER) && ((__INTEL_COMPILER == 9999) || (__INTEL_COMPILER == 1210))
// Workaround for Intel support issue #656654.
// See also https://svn.boost.org/trac/boost/ticket/6359
return toi(i, j, base, mpl::false_());