mirror of
https://github.com/boostorg/regex.git
synced 2025-07-16 13:52:17 +02:00
Merge accumulated minor fixes from Trunk.
[SVN r74964]
This commit is contained in:
@ -251,7 +251,7 @@ inline u32regex do_make_u32regex(InputIterator i,
|
||||
const boost::mpl::int_<1>*)
|
||||
{
|
||||
typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type;
|
||||
return u32regex(conv_type(i), conv_type(j), opt);
|
||||
return u32regex(conv_type(i, i, j), conv_type(j, i, j), opt);
|
||||
}
|
||||
|
||||
template <class InputIterator>
|
||||
@ -261,7 +261,7 @@ inline u32regex do_make_u32regex(InputIterator i,
|
||||
const boost::mpl::int_<2>*)
|
||||
{
|
||||
typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type;
|
||||
return u32regex(conv_type(i), conv_type(j), opt);
|
||||
return u32regex(conv_type(i, i, j), conv_type(j, i, j), opt);
|
||||
}
|
||||
|
||||
template <class InputIterator>
|
||||
@ -282,7 +282,7 @@ inline u32regex do_make_u32regex(InputIterator i,
|
||||
typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type;
|
||||
typedef std::vector<UChar32> vector_type;
|
||||
vector_type v;
|
||||
conv_type a(i), b(j);
|
||||
conv_type a(i, i, j), b(j, i, j);
|
||||
while(a != b)
|
||||
{
|
||||
v.push_back(*a);
|
||||
@ -302,7 +302,7 @@ inline u32regex do_make_u32regex(InputIterator i,
|
||||
typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type;
|
||||
typedef std::vector<UChar32> vector_type;
|
||||
vector_type v;
|
||||
conv_type a(i), b(j);
|
||||
conv_type a(i, i, j), b(j, i, j);
|
||||
while(a != b)
|
||||
{
|
||||
v.push_back(*a);
|
||||
@ -425,7 +425,7 @@ bool do_regex_match(BidiIterator first, BidiIterator last,
|
||||
typedef match_results<conv_type> match_type;
|
||||
typedef typename match_type::allocator_type alloc_type;
|
||||
match_type what;
|
||||
bool result = ::boost::regex_match(conv_type(first), conv_type(last), what, e, flags);
|
||||
bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
|
||||
// copy results across to m:
|
||||
if(result) copy_results(m, what);
|
||||
return result;
|
||||
@ -441,7 +441,7 @@ bool do_regex_match(BidiIterator first, BidiIterator last,
|
||||
typedef match_results<conv_type> match_type;
|
||||
typedef typename match_type::allocator_type alloc_type;
|
||||
match_type what;
|
||||
bool result = ::boost::regex_match(conv_type(first), conv_type(last), what, e, flags);
|
||||
bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
|
||||
// copy results across to m:
|
||||
if(result) copy_results(m, what);
|
||||
return result;
|
||||
@ -600,7 +600,7 @@ bool do_regex_search(BidiIterator first, BidiIterator last,
|
||||
typedef match_results<conv_type> match_type;
|
||||
typedef typename match_type::allocator_type alloc_type;
|
||||
match_type what;
|
||||
bool result = ::boost::regex_search(conv_type(first), conv_type(last), what, e, flags, conv_type(base));
|
||||
bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
|
||||
// copy results across to m:
|
||||
if(result) copy_results(m, what);
|
||||
return result;
|
||||
@ -617,7 +617,7 @@ bool do_regex_search(BidiIterator first, BidiIterator last,
|
||||
typedef match_results<conv_type> match_type;
|
||||
typedef typename match_type::allocator_type alloc_type;
|
||||
match_type what;
|
||||
bool result = ::boost::regex_search(conv_type(first), conv_type(last), what, e, flags, conv_type(base));
|
||||
bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
|
||||
// copy results across to m:
|
||||
if(result) copy_results(m, what);
|
||||
return result;
|
||||
|
@ -1226,7 +1226,7 @@ void basic_regex_creator<charT, traits>::create_startmap(re_syntax_base* state,
|
||||
for(unsigned int i = 0; i < (1u << CHAR_BIT); ++i)
|
||||
{
|
||||
charT c = static_cast<charT>(i);
|
||||
if(&c != re_is_set_member(&c, &c + 1, static_cast<re_set_long<mask_type>*>(state), *m_pdata, m_icase))
|
||||
if(&c != re_is_set_member(&c, &c + 1, static_cast<re_set_long<mask_type>*>(state), *m_pdata, l_icase))
|
||||
l_map[i] |= mask;
|
||||
}
|
||||
}
|
||||
|
@ -842,7 +842,15 @@ OutputIterator regex_format_imp(OutputIterator out,
|
||||
|
||||
BOOST_MPL_HAS_XXX_TRAIT_DEF(const_iterator)
|
||||
|
||||
struct any_type { any_type(...); };
|
||||
struct any_type
|
||||
{
|
||||
template <class T>
|
||||
any_type(const T&);
|
||||
template <class T, class U>
|
||||
any_type(const T&, const U&);
|
||||
template <class T, class U, class V>
|
||||
any_type(const T&, const U&, const V&);
|
||||
};
|
||||
typedef char no_type;
|
||||
typedef char (&unary_type)[2];
|
||||
typedef char (&binary_type)[3];
|
||||
|
Reference in New Issue
Block a user