diff --git a/old_include/fileiter.h b/old_include/fileiter.h index 2fa0ba37..7a3a75e6 100644 --- a/old_include/fileiter.h +++ b/old_include/fileiter.h @@ -16,7 +16,7 @@ #ifndef BOOST_FILEITER_H #define BOOST_FILEITER_H -#include +#include using boost::re_detail::directory_iterator; using boost::re_detail::file_iterator; diff --git a/old_include/regex.h b/old_include/regex.h index e3e63b11..7d8ba539 100644 --- a/old_include/regex.h +++ b/old_include/regex.h @@ -68,16 +68,7 @@ public: template bool query_match(iterator first, iterator last, boost::match_results& m, const reg_expression& e, unsigned flags = match_default) { - // prepare m for failure: - if((flags & match_init) == 0) - { - m.set_size(e.mark_count(), first, last); - m.set_base(first); - m.set_line(1, first); - } - boost::re_detail::_priv_match_data pd(m); - iterator restart; - return boost::re_detail::query_match_aux(first, last, m, e, flags, pd, &restart); + return regex_search(first, last, m, e, flags | match_continuous); } // @@ -144,13 +135,7 @@ inline bool query_match(const std::basic_string& s, template bool reg_search(iterator first, iterator last, boost::match_results& m, const reg_expression& e, unsigned flags = match_default) { - if(e.flags() & regbase::failbit) - return false; - - typedef typename traits::size_type traits_size_type; - typedef typename traits::uchar_type traits_uchar_type; - - return boost::re_detail::reg_grep2(boost::re_detail::grep_search_predicate(&m), first, last, e, flags, m.allocator()); + return boost::regex_search(first, last, m, e, flags); } // @@ -226,7 +211,7 @@ inline bool reg_search(const std::basic_string& s, template inline unsigned int reg_grep(Predicate foo, iterator first, iterator last, const reg_expression& e, unsigned flags = match_default) { - return boost::re_detail::reg_grep2(foo, first, last, e, flags, e.allocator()); + return boost::regex_grep(foo, first, last, e, flags); } // @@ -345,7 +330,7 @@ struct grep_adaptor template inline unsigned int reg_grep_old(Out oi, iterator first, iterator last, const reg_expression& e, unsigned flags = match_default) { - return boost::re_detail::reg_grep2(re_detail::grep_adaptor(oi, e.allocator()), first, last, e, flags, e.allocator()); + return boost::regex_grep(re_detail::grep_adaptor(oi, e.allocator()), first, last, e, flags); } template @@ -407,9 +392,9 @@ using deprecated::reg_search; using deprecated::reg_grep; using deprecated::reg_format; using deprecated::reg_merge; -using re_detail::jm_def_alloc; +//using re_detail::jm_def_alloc; using deprecated::char_regex_traits_i; -using re_detail::re_alloc_binder; +//using re_detail::re_alloc_binder; using re_detail::padding_size; @@ -440,7 +425,7 @@ using boost::deprecated::reg_search; using boost::deprecated::reg_grep; using boost::deprecated::reg_format; using boost::deprecated::reg_merge; -using boost::re_detail::jm_def_alloc; +//using boost::re_detail::jm_def_alloc; #endif