diff --git a/test/concepts/concept_check.cpp b/test/concepts/concept_check.cpp index 3fc4af00..07cbfb64 100644 --- a/test/concepts/concept_check.cpp +++ b/test/concepts/concept_check.cpp @@ -88,6 +88,8 @@ int main() r.assign(c_exp, c_exp+1); r.assign(c_exp, c_exp+1, boost::regex::perl); #endif + +#ifndef BOOST_NO_STD_ITERATOR // //check iterators work with std lib algorithms: // @@ -97,6 +99,7 @@ int main() boost::cregex_token_iterator rk, rm; std::distance(rk, rm); std::advance(rk, 0); +#endif return 0; } diff --git a/test/regress/tests.txt b/test/regress/tests.txt index e3b6ee17..b57f3919 100644 --- a/test/regress/tests.txt +++ b/test/regress/tests.txt @@ -1018,6 +1018,7 @@ ab.{2,5}? ab__ 0 4 ab.{2,5}? ab_______ 0 4 ab.{2,5}?xy ab______xy -1 -1 ab.{2,5}xy ab_xy -1 -1 +(.*?).somesite \n\n555.somesite 2 14 2 5 ; now again for single character repeats: @@ -1054,6 +1055,7 @@ ab_{2,5}? ab__ 0 4 ab_{2,5}? ab_______ 0 4 ab_{2,5}?xy ab______xy -1 -1 ab_{2,5}xy ab_xy -1 -1 +(5*?).somesite //555.somesite 2 14 2 5 ; and again for sets: ab[_,;]*xy abxy_ 0 4 @@ -1089,6 +1091,7 @@ ab[_,;]{2,5}? ab__ 0 4 ab[_,;]{2,5}? ab_______ 0 4 ab[_,;]{2,5}?xy ab______xy -1 -1 ab[_,;]{2,5}xy ab_xy -1 -1 +(\d*?).somesite //555.somesite 2 14 2 5 ; and again for tricky sets with digraphs: ab[_[.ae.]]*xy abxy_ 0 4 @@ -1124,6 +1127,7 @@ ab[_[.ae.]]{2,5}? ab__ 0 4 ab[_[.ae.]]{2,5}? ab_______ 0 4 ab[_[.ae.]]{2,5}?xy ab______xy -1 -1 ab[_[.ae.]]{2,5}xy ab_xy -1 -1 +([5[.ae.]]*?).somesite //555.somesite 2 14 2 5 ; new bugs detected in spring 2003: - normal match_continuous REG_NO_POSIX_TEST