diff --git a/include/boost/algorithm/string/detail/finder_regex.hpp b/include/boost/algorithm/string/detail/finder_regex.hpp index 9006151..467e98d 100644 --- a/include/boost/algorithm/string/detail/finder_regex.hpp +++ b/include/boost/algorithm/string/detail/finder_regex.hpp @@ -33,9 +33,9 @@ namespace boost { typedef BOOST_STRING_TYPENAME base_type::difference_type difference_type; typedef BOOST_STRING_TYPENAME base_type::const_iterator const_iterator; typedef BOOST_STRING_TYPENAME base_type::iterator iterator; - typedef match_results match_results_type; + typedef boost::match_results match_results_type; - // Contruction + // Construction // Construction from the match result regex_search_result( const match_results_type& MatchResults ) : diff --git a/include/boost/algorithm/string/detail/sequence.hpp b/include/boost/algorithm/string/detail/sequence.hpp index dbce9c9..e2f60fc 100644 --- a/include/boost/algorithm/string/detail/sequence.hpp +++ b/include/boost/algorithm/string/detail/sequence.hpp @@ -22,15 +22,6 @@ namespace boost { // insert helpers -------------------------------------------------// - template< typename InputT, typename InsertT > - inline void insert( - InputT& Input, - BOOST_STRING_TYPENAME InputT::iterator At, - const InsertT& Insert ) - { - insert( Input, At, begin(Insert), end(Insert) ); - } - template< typename InputT, typename ForwardIteratorT > inline void insert( InputT& Input, @@ -40,7 +31,16 @@ namespace boost { { Input.insert( At, Begin, End ); } - + + template< typename InputT, typename InsertT > + inline void insert( + InputT& Input, + BOOST_STRING_TYPENAME InputT::iterator At, + const InsertT& Insert ) + { + insert( Input, At, begin(Insert), end(Insert) ); + } + // erase helper ---------------------------------------------------// // Erase a range in the sequence @@ -153,16 +153,6 @@ namespace boost { // replace helper -------------------------------------------------// - template< typename InputT, typename InsertT > - inline void replace( - InputT& Input, - BOOST_STRING_TYPENAME InputT::iterator From, - BOOST_STRING_TYPENAME InputT::iterator To, - const InsertT& Insert ) - { - replace( Input, From, To, begin(Insert), end(Insert) ); - } - template< typename InputT, typename ForwardIteratorT > inline void replace( InputT& Input, @@ -175,6 +165,16 @@ namespace boost { Input, From, To, Begin, End ); }; + template< typename InputT, typename InsertT > + inline void replace( + InputT& Input, + BOOST_STRING_TYPENAME InputT::iterator From, + BOOST_STRING_TYPENAME InputT::iterator To, + const InsertT& Insert ) + { + replace( Input, From, To, begin(Insert), end(Insert) ); + } + } // namespace detail } // namespace algorithm } // namespace boost