[Boost-commit] svn:boost r76319 - trunk/boost/regex/v4

Subject: [Boost-commit] svn:boost r76319 - trunk/boost/regex/v4
From: john_at_[hidden]
Date: 2012-01-05 08:33:49

Author: johnmaddock
Date: 2012-01-05 08:33:48 EST (Thu, 05 Jan 2012)
New Revision: 76319
URL: http://svn.boost.org/trac/boost/changeset/76319

Log:
Add workaround for Intel-12.1 on Windows.
Fixes #6359.
Text files modified: 
   trunk/boost/regex/v4/regex_format.hpp |     6 ++++++                                  
   1 files changed, 6 insertions(+), 0 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 08:33:48 EST (Thu, 05 Jan 2012)
@@ -180,8 +180,14 @@
    }
    inline int toi(ForwardIter& i, ForwardIter j, int base)
    {
+#if defined(_MSC_VER) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 9999)
+      // Workaround for Intel support issue #656654.
+      // See also https://svn.boost.org/trac/boost/ticket/6359
+      return toi(i, j, base, mpl::false_());
+#else
       typedef typename boost::is_convertible<ForwardIter, const char_type*&>::type tag_type;
       return toi(i, j, base, tag_type());
+#endif
    }
 
    const traits&    m_traits;       // the traits class for localised formatting operations