forked from boostorg/regex
Minor regex config changes, fixed KMP search code.
[SVN r10115]
This commit is contained in:
@ -307,10 +307,10 @@ full list of macros and their usage.
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _REENTRANT
|
#if defined(_REENTRANT) || defined(_PTHREADS)
|
||||||
//
|
//
|
||||||
// several compilers define _REENTRANT when
|
// Several compilers define _REENTRANT or
|
||||||
// threading support is turned on:
|
// _PTHREADS when threading support is turned on:
|
||||||
//
|
//
|
||||||
#define BOOST_RE_THREADS
|
#define BOOST_RE_THREADS
|
||||||
#endif
|
#endif
|
||||||
|
@ -1192,13 +1192,13 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
|
|||||||
++cmatches;
|
++cmatches;
|
||||||
if(foo(m) == false)
|
if(foo(m) == false)
|
||||||
return cmatches;
|
return cmatches;
|
||||||
|
if(m[0].second == last)
|
||||||
|
return cmatches;
|
||||||
_skip_and_inc(clines, last_line, first, restart);
|
_skip_and_inc(clines, last_line, first, restart);
|
||||||
next_base = m[0].second;
|
next_base = m[0].second;
|
||||||
pd.temp_match.init_fail(next_base, last);
|
pd.temp_match.init_fail(next_base, last);
|
||||||
m.init_fail(next_base, last);
|
m.init_fail(next_base, last);
|
||||||
j = 0;
|
j = 0;
|
||||||
if(m[0].second == last)
|
|
||||||
return cmatches;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -326,7 +326,7 @@ iterator_category(const debug_iterator<T>&) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef BOOST_MSVC
|
#if (defined(BOOST_MSVC) || defined(__ICL)) && (defined(_YVALS) || defined(_CPPLIB_VER))
|
||||||
namespace std{
|
namespace std{
|
||||||
template <class T>
|
template <class T>
|
||||||
inline random_access_iterator_tag __cdecl
|
inline random_access_iterator_tag __cdecl
|
||||||
@ -370,3 +370,4 @@ typedef boost::reg_expression<char_t, boost::c_regex_traits<char_t>, jm_debug_al
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user