From 74d63181354bd0ce6145198119514ddac9cf6f04 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Thu, 19 Mar 2015 19:50:00 +0000 Subject: [PATCH] Add missing function bodies for sub_match::begin/end and enhance tests. --- include/boost/regex/v4/sub_match.hpp | 4 ++-- test/Jamfile.v2 | 6 +++--- test/concepts/icu_concept_check.cpp | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/boost/regex/v4/sub_match.hpp b/include/boost/regex/v4/sub_match.hpp index 84c181eb..bd31d58c 100644 --- a/include/boost/regex/v4/sub_match.hpp +++ b/include/boost/regex/v4/sub_match.hpp @@ -165,8 +165,8 @@ public: // // Make this type a range, for both Boost.Range, and C++11: // - BidiIterator begin()const; - BidiIterator end()const; + BidiIterator begin()const { return this->first; } + BidiIterator end()const { return this->second; } #ifdef BOOST_OLD_REGEX_H diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index d6aa8a44..dfba9277 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -149,9 +149,9 @@ test-suite regex : : : always_show_run_output : test_collate_info ] - [ compile concepts/concept_check.cpp ] - [ compile concepts/icu_concept_check.cpp ] - [ compile concepts/range_concept_check.cpp ] + [ link concepts/concept_check.cpp ../build//boost_regex ] + [ link concepts/icu_concept_check.cpp ../build//boost_regex ] + [ link concepts/range_concept_check.cpp ../build//boost_regex ] [ run # sources diff --git a/test/concepts/icu_concept_check.cpp b/test/concepts/icu_concept_check.cpp index 526758a4..3c1363eb 100644 --- a/test/concepts/icu_concept_check.cpp +++ b/test/concepts/icu_concept_check.cpp @@ -154,4 +154,11 @@ int main() return 0; } +#else + +int main() +{ + return 0; +} + #endif