diff --git a/include/boost/regex/icu.hpp b/include/boost/regex/icu.hpp index 059b7b16..53941b64 100644 --- a/include/boost/regex/icu.hpp +++ b/include/boost/regex/icu.hpp @@ -277,8 +277,8 @@ inline u32regex do_make_u32regex(InputIterator i, conv_type a(i), b(j); while(a != b) { - v.push_back(*a); - ++a; + v.push_back(*a); + ++a; } if(v.size()) return u32regex(&*v.begin(), v.size(), opt); @@ -297,8 +297,8 @@ inline u32regex do_make_u32regex(InputIterator i, conv_type a(i), b(j); while(a != b) { - v.push_back(*a); - ++a; + v.push_back(*a); + ++a; } if(v.size()) return u32regex(&*v.begin(), v.size(), opt); @@ -315,8 +315,8 @@ inline u32regex do_make_u32regex(InputIterator i, vector_type v; while(i != j) { - v.push_back((UCHAR32)(*i)); - ++a; + v.push_back((UCHAR32)(*i)); + ++a; } if(v.size()) return u32regex(&*v.begin(), v.size(), opt); @@ -880,7 +880,7 @@ inline OutputIterator u32regex_replace(OutputIterator out, #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) #endif - ( + ( re_detail::do_regex_replace( re_detail::make_utf32_out(out, static_cast const*>(0)), re_detail::make_utf32_seq(first, last, static_cast const*>(0)), @@ -902,7 +902,7 @@ inline OutputIterator u32regex_replace(OutputIterator out, #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) #endif - ( + ( re_detail::do_regex_replace( re_detail::make_utf32_out(out, static_cast const*>(0)), re_detail::make_utf32_seq(first, last, static_cast const*>(0)), @@ -924,7 +924,7 @@ inline OutputIterator u32regex_replace(OutputIterator out, #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) #endif - ( + ( re_detail::do_regex_replace( re_detail::make_utf32_out(out, static_cast const*>(0)), re_detail::make_utf32_seq(first, last, static_cast const*>(0)), diff --git a/include/boost/regex/v4/basic_regex_creator.hpp b/include/boost/regex/v4/basic_regex_creator.hpp index 22a23775..a03c9520 100644 --- a/include/boost/regex/v4/basic_regex_creator.hpp +++ b/include/boost/regex/v4/basic_regex_creator.hpp @@ -1185,7 +1185,7 @@ bool basic_regex_creator::is_bad_repeat(re_syntax_base* pt) unsigned id = static_cast(pt)->id; if(id > sizeof(m_bad_repeats) * CHAR_BIT) return true; // run out of bits, assume we can't traverse this one. - static const boost::uintmax_t one = 1uL; + static const boost::uintmax_t one = 1uL; return m_bad_repeats & (one << id); } default: @@ -1205,7 +1205,7 @@ void basic_regex_creator::set_bad_repeat(re_syntax_base* pt) case syntax_element_long_set_rep: { unsigned id = static_cast(pt)->id; - static const boost::uintmax_t one = 1uL; + static const boost::uintmax_t one = 1uL; if(id <= sizeof(m_bad_repeats) * CHAR_BIT) m_bad_repeats |= (one << id); } diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp index 50102751..ad77d054 100644 --- a/include/boost/regex/v4/basic_regex_parser.hpp +++ b/include/boost/regex/v4/basic_regex_parser.hpp @@ -1220,17 +1220,17 @@ void basic_regex_parser::parse_set_literal(basic_char_setm_traits.syntax_type(*m_position) == regex_constants::syntax_dash) { - if(m_end == ++m_position) - { - fail(regex_constants::error_brack, m_position - m_base); - return; - } - if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_set) - { + if(m_end == ++m_position) + { + fail(regex_constants::error_brack, m_position - m_base); + return; + } + if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_set) + { // trailing - : --m_position; return; - } + } fail(regex_constants::error_range, m_position - m_base); return; }