forked from boostorg/regex
Patches for vc7+stlport
[SVN r20951]
This commit is contained in:
@ -38,7 +38,7 @@ private:
|
|||||||
#endif
|
#endif
|
||||||
public:
|
public:
|
||||||
typedef sub_match<RandomAccessIterator> value_type;
|
typedef sub_match<RandomAccessIterator> value_type;
|
||||||
#ifndef BOOST_NO_STD_ALLOCATOR
|
#if !defined(BOOST_NO_STD_ALLOCATOR) && !(defined(BOOST_MSVC) && defined(_STLPORT_VERSION))
|
||||||
typedef typename Allocator::const_reference const_reference;
|
typedef typename Allocator::const_reference const_reference;
|
||||||
#else
|
#else
|
||||||
typedef const value_type& const_reference;
|
typedef const value_type& const_reference;
|
||||||
|
@ -519,7 +519,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
|
|||||||
return match_dot_repeat_slow();
|
return match_dot_repeat_slow();
|
||||||
|
|
||||||
const re_repeat* rep = static_cast<const re_repeat*>(pstate);
|
const re_repeat* rep = static_cast<const re_repeat*>(pstate);
|
||||||
unsigned count = std::min(static_cast<unsigned>(re_detail::distance(position, last)), (rep->greedy ? rep->max : rep->min));
|
unsigned count = std::min(static_cast<unsigned>(re_detail::distance(position, last)), static_cast<unsigned>(rep->greedy ? rep->max : rep->min));
|
||||||
if(rep->min > count)
|
if(rep->min > count)
|
||||||
return false; // not enough text left to match
|
return false; // not enough text left to match
|
||||||
std::advance(position, count);
|
std::advance(position, count);
|
||||||
|
Reference in New Issue
Block a user