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

Warning supression for VC7.1.

Browse Source 
[SVN r32430]
This commit is contained in:
John Maddock
2006-01-27 10:35:04 +00:00
parent c30c8c281a
commit 2dbf1804ba
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,7 +243,8 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_perl()
default: default:
// see if we have a number: // see if we have a number:
{ {
std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), ::boost::re_detail::distance(m_position, m_end)); std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
len = (std::min)(static_cast<std::ptrdiff_t>(2), len);
int v = m_traits.toi(m_position, m_position + len, 10); int v = m_traits.toi(m_position, m_position + len, 10);
if(v < 0) if(v < 0)
{ {
@ -327,7 +328,8 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_escape()
} }
else else
{ {
std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), ::boost::re_detail::distance(m_position, m_end)); std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
len = (std::min)(static_cast<std::ptrdiff_t>(2), len);
int val = m_traits.toi(m_position, m_position + len, 16); int val = m_traits.toi(m_position, m_position + len, 16);
if(val < 0) if(val < 0)
{ {
@ -398,7 +400,8 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_escape()
{ {
// octal ecape sequence: // octal ecape sequence:
--m_position; --m_position;
std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(4), ::boost::re_detail::distance(m_position, m_end)); std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
len = (std::min)(static_cast<std::ptrdiff_t>(4), len);
v = m_traits.toi(m_position, m_position + len, 8); v = m_traits.toi(m_position, m_position + len, 8);
BOOST_ASSERT(v >= 0); BOOST_ASSERT(v >= 0);
put(static_cast<char_type>(v)); put(static_cast<char_type>(v));
@ -419,7 +422,8 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_conditional(
put(static_cast<char_type>('?')); put(static_cast<char_type>('?'));
return; return;
} }
std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), ::boost::re_detail::distance(m_position, m_end)); std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
len = (std::min)(static_cast<std::ptrdiff_t>(2), len);
int v = m_traits.toi(m_position, m_position + len, 10); int v = m_traits.toi(m_position, m_position + len, 10);
if(v < 0) if(v < 0)
{ {