From eedb7b5063cd4b7630f5062a8f1ed04d63d6cec2 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Thu, 5 Jan 2012 13:33:48 +0000
Subject: [PATCH] Add workaround for Intel-12.1 on Windows. Fixes #6359.

[SVN r76319]
---
 include/boost/regex/v4/regex_format.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp
index e05862fa..3b70d4b0 100644
--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@@ -180,8 +180,14 @@ private:
    }
    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