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

Merge regex bug fix.

Browse Source 
Refs #8569.

[SVN r84463]
This commit is contained in:
John Maddock
2013-05-24 17:09:40 +00:00
parent f6870ad64a
commit b738a55e0d
96 changed files with 450 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/regex/v4/regex_format.hpp
View File

@ -283,7 +283,8 @@ void basic_regex_formatter<OutputIterator, Results, traits, ForwardIter>::format
format_perl();
break;
}
// fall through, not a special character:
// not a special character:
BOOST_FALLTHROUGH;
default:
put(*m_position);
++m_position;
@ -354,7 +355,7 @@ void basic_regex_formatter<OutputIterator, Results, traits, ForwardIter>::format
case '{':
have_brace = true;
++m_position;
// fall through....
BOOST_FALLTHROUGH;
default:
// see if we have a number:
{
@ -1064,7 +1065,7 @@ struct format_functor_c_string
template <class OutputIter>
OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
{
typedef typename Match::char_type char_type;
//typedef typename Match::char_type char_type;
const charT* end = func;
while(*end) ++end;
return regex_format_imp(i, m, func, end, f, t);
@ -1083,7 +1084,7 @@ struct format_functor_container
template <class OutputIter>
OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
{
typedef typename Match::char_type char_type;
//typedef typename Match::char_type char_type;
return re_detail::regex_format_imp(i, m, func.begin(), func.end(), f, t);
}
private: