forked from boostorg/regex
Hopefully fixed some minor bugs:
added missing typesnames. Changed iterator to Iterator to hopefully keep aCC happy. [SVN r14020]
This commit is contained in:
@ -636,6 +636,7 @@ void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::move_offsets(re_
|
||||
template <class charT, class traits, class Allocator>
|
||||
re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot)
|
||||
{
|
||||
typedef typename re_detail::is_byte<charT>::width_type width_type;
|
||||
re_detail::jstack<traits_string_type, Allocator> singles(64, data.allocator());
|
||||
re_detail::jstack<traits_string_type, Allocator> ranges(64, data.allocator());
|
||||
re_detail::jstack<boost::uint_fast32_t, Allocator> classes(64, data.allocator());
|
||||
@ -646,7 +647,7 @@ re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Alloca
|
||||
data.align();
|
||||
dat->next.i = data.size();
|
||||
}
|
||||
return compile_set_aux(singles, ranges, classes, equivalents, isnot, re_detail::is_byte<charT>::width_type());
|
||||
return compile_set_aux(singles, ranges, classes, equivalents, isnot, width_type());
|
||||
}
|
||||
|
||||
template <class charT, class traits, class Allocator>
|
||||
@ -953,11 +954,13 @@ re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Alloca
|
||||
if(!done)
|
||||
return 0;
|
||||
|
||||
typedef typename re_detail::is_byte<charT>::width_type width_type;
|
||||
|
||||
re_detail::re_syntax_base* result;
|
||||
if(has_digraphs)
|
||||
result = compile_set_aux(singles, ranges, classes, equivalents, isnot, re_detail::_wide_type());
|
||||
else
|
||||
result = compile_set_aux(singles, ranges, classes, equivalents, isnot, re_detail::is_byte<charT>::width_type());
|
||||
result = compile_set_aux(singles, ranges, classes, equivalents, isnot, width_type());
|
||||
#ifdef __BORLANDC__
|
||||
// delayed throw:
|
||||
if((result == 0) && (_flags & regbase::use_except))
|
||||
|
Reference in New Issue
Block a user