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

Fix integer types and signedness:

Browse Source 
Fixes https://svn.boost.org/trac10/ticket/13034
This commit is contained in:
jzmaddock
2017-07-31 18:51:25 +01:00
parent ab399c9159
commit d97bcfb5dd
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ inline int string_compare(const Seq& s, const C* p)
{ {
++i; ++i;
} }
return (i == s.size()) ? -p[i] : s[i] - p[i]; return (i == s.size()) ? -(int)p[i] : (int)s[i] - (int)p[i];
} }
# define STR_COMP(s,p) string_compare(s,p) # define STR_COMP(s,p) string_compare(s,p)

4
include/boost/regex/v4/perl_matcher_non_recursive.hpp
View File

@ -688,7 +688,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_rep()
template <class BidiIterator, class Allocator, class traits> template <class BidiIterator, class Allocator, class traits>
bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow() bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow()
{ {
unsigned count = 0; std::size_t count = 0;
const re_repeat* rep = static_cast<const re_repeat*>(pstate); const re_repeat* rep = static_cast<const re_repeat*>(pstate);
re_syntax_base* psingle = rep->next.p; re_syntax_base* psingle = rep->next.p;
// match compulsary repeats first: // match compulsary repeats first:
@ -740,7 +740,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
const re_repeat* rep = static_cast<const re_repeat*>(pstate); const re_repeat* rep = static_cast<const re_repeat*>(pstate);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent); bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
unsigned count = static_cast<unsigned>((std::min)(static_cast<unsigned>(::boost::BOOST_REGEX_DETAIL_NS::distance(position, last)), static_cast<unsigned>(greedy ? rep->max : rep->min))); std::size_t count = static_cast<std::size_t>((std::min)(static_cast<std::size_t>(::boost::BOOST_REGEX_DETAIL_NS::distance(position, last)), greedy ? rep->max : rep->min));
if(rep->min > count) if(rep->min > count)
{ {
position = last; position = last;

8
include/boost/regex/v4/perl_matcher_recursive.hpp
View File

@ -423,7 +423,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow()
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4127) #pragma warning(disable:4127)
#endif #endif
unsigned count = 0; std::size_t count = 0;
const re_repeat* rep = static_cast<const re_repeat*>(pstate); const re_repeat* rep = static_cast<const re_repeat*>(pstate);
re_syntax_base* psingle = rep->next.p; re_syntax_base* psingle = rep->next.p;
// match compulsary repeats first: // match compulsary repeats first:
@ -497,7 +497,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
#pragma warning(disable:4267) #pragma warning(disable:4267)
#endif #endif
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent); bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t count = (std::min)(static_cast<std::size_t>(::boost::BOOST_REGEX_DETAIL_NS::distance(position, last)), static_cast<std::size_t>(greedy ? rep->max : rep->min)); std::size_t count = (std::min)(static_cast<std::size_t>(::boost::BOOST_REGEX_DETAIL_NS::distance(position, last)), greedy ? rep->max : rep->min);
if(rep->min > count) if(rep->min > count)
{ {
position = last; position = last;
@ -657,7 +657,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_set_repeat()
#endif #endif
const re_repeat* rep = static_cast<const re_repeat*>(pstate); const re_repeat* rep = static_cast<const re_repeat*>(pstate);
const unsigned char* map = static_cast<const re_set*>(rep->next.p)->_map; const unsigned char* map = static_cast<const re_set*>(rep->next.p)->_map;
unsigned count = 0; std::size_t count = 0;
// //
// start by working out how much we can skip: // start by working out how much we can skip:
// //
@ -753,7 +753,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat()
typedef typename traits::char_class_type char_class_type; typedef typename traits::char_class_type char_class_type;
const re_repeat* rep = static_cast<const re_repeat*>(pstate); const re_repeat* rep = static_cast<const re_repeat*>(pstate);
const re_set_long<char_class_type>* set = static_cast<const re_set_long<char_class_type>*>(pstate->next.p); const re_set_long<char_class_type>* set = static_cast<const re_set_long<char_class_type>*>(pstate->next.p);
unsigned count = 0; std::size_t count = 0;
// //
// start by working out how much we can skip: // start by working out how much we can skip:
// //