feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Suppress a few warnings.

Browse Source 
[SVN r59275]
This commit is contained in:
John Maddock
2010-01-27 13:17:51 +00:00
parent e1bd7c7a9b
commit c8e56504d9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/regex/v4/basic_regex_creator.hpp
View File

@ -804,7 +804,7 @@ void basic_regex_creator<charT, traits>::fixup_recursions(re_syntax_base* state)
{ {
bool ok = false; bool ok = false;
re_syntax_base* p = base; re_syntax_base* p = base;
int id = static_cast<re_jump*>(state)->alt.i; std::ptrdiff_t id = static_cast<re_jump*>(state)->alt.i;
if(id > 10000) if(id > 10000)
id = m_pdata->get_id(id); id = m_pdata->get_id(id);
while(p) while(p)

2
include/boost/regex/v4/match_results.hpp
View File

@ -457,7 +457,7 @@ public:
void BOOST_REGEX_CALL set_second(BidiIterator i, size_type pos, bool m = true, bool escape_k = false) void BOOST_REGEX_CALL set_second(BidiIterator i, size_type pos, bool m = true, bool escape_k = false)
{ {
if(pos) if(pos)
m_last_closed_paren = pos; m_last_closed_paren = static_cast<int>(pos);
pos += 2; pos += 2;
BOOST_ASSERT(m_subs.size() > pos); BOOST_ASSERT(m_subs.size() > pos);
m_subs[pos].second = i; m_subs[pos].second = i;

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

@ -334,7 +334,7 @@ void basic_regex_formatter<OutputIterator, Results, traits, ForwardIter>::format
m_position = --base; m_position = --base;
} }
} }
put((this->m_results)[this->m_results.size() > 1 ? this->m_results.size() - 1 : 1]); put((this->m_results)[this->m_results.size() > 1 ? static_cast<int>(this->m_results.size() - 1) : 1]);
break; break;
case '{': case '{':
have_brace = true; have_brace = true;
@ -384,7 +384,7 @@ bool basic_regex_formatter<OutputIterator, Results, traits, ForwardIter>::handle
if(have_brace && (*m_position == '^')) if(have_brace && (*m_position == '^'))
++m_position; ++m_position;
int max_len = m_end - m_position; std::ptrdiff_t max_len = m_end - m_position;
if((max_len >= 5) && std::equal(m_position, m_position + 5, MATCH)) if((max_len >= 5) && std::equal(m_position, m_position + 5, MATCH))
{ {
@ -447,7 +447,7 @@ bool basic_regex_formatter<OutputIterator, Results, traits, ForwardIter>::handle
return false; return false;
} }
} }
put((this->m_results)[this->m_results.size() > 1 ? this->m_results.size() - 1 : 1]); put((this->m_results)[this->m_results.size() > 1 ? static_cast<int>(this->m_results.size() - 1) : 1]);
return true; return true;
} }
if((max_len >= 20) && std::equal(m_position, m_position + 20, LAST_SUBMATCH_RESULT)) if((max_len >= 20) && std::equal(m_position, m_position + 20, LAST_SUBMATCH_RESULT))