boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-19 07:12:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge warning fixes from Trunk.

Browse Source 
Merge Documentation fixes from Trunk.
Merge updated makefiles from Trunk.

[SVN r78577]
This commit is contained in:
John Maddock
2012-05-24 10:03:48 +00:00
parent 090520dbb4
commit 5964976b93
107 changed files with 3817 additions and 3747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/regex/v4/regex_format.hpp
View File

@ -180,8 +180,14 @@ private:
}
inline int toi(ForwardIter& i, ForwardIter j, int base)
{
#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_());
#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