diff options
Diffstat (limited to 'boost/regex/v4/sub_match.hpp')
-rw-r--r-- | boost/regex/v4/sub_match.hpp | 143 |
1 files changed, 74 insertions, 69 deletions
diff --git a/boost/regex/v4/sub_match.hpp b/boost/regex/v4/sub_match.hpp index 7ce8d5397e..ff8a8e467b 100644 --- a/boost/regex/v4/sub_match.hpp +++ b/boost/regex/v4/sub_match.hpp @@ -35,11 +35,11 @@ namespace boost{ template <class BidiIterator> struct sub_match : public std::pair<BidiIterator, BidiIterator> { - typedef typename re_detail::regex_iterator_traits<BidiIterator>::value_type value_type; + typedef typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<BidiIterator>::value_type value_type; #if defined(BOOST_NO_STD_ITERATOR_TRAITS) typedef std::ptrdiff_t difference_type; #else - typedef typename re_detail::regex_iterator_traits<BidiIterator>::difference_type difference_type; + typedef typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<BidiIterator>::difference_type difference_type; #endif typedef BidiIterator iterator_type; typedef BidiIterator iterator; @@ -65,7 +65,7 @@ struct sub_match : public std::pair<BidiIterator, BidiIterator> #endif difference_type BOOST_REGEX_CALL length()const { - difference_type n = matched ? ::boost::re_detail::distance((BidiIterator)this->first, (BidiIterator)this->second) : 0; + difference_type n = matched ? ::boost::BOOST_REGEX_DETAIL_NS::distance((BidiIterator)this->first, (BidiIterator)this->second) : 0; return n; } std::basic_string<value_type> str()const @@ -73,7 +73,7 @@ struct sub_match : public std::pair<BidiIterator, BidiIterator> std::basic_string<value_type> result; if(matched) { - std::size_t len = ::boost::re_detail::distance((BidiIterator)this->first, (BidiIterator)this->second); + std::size_t len = ::boost::BOOST_REGEX_DETAIL_NS::distance((BidiIterator)this->first, (BidiIterator)this->second); result.reserve(len); BidiIterator i = this->first; while(i != this->second) @@ -162,6 +162,11 @@ public: #endif return *this; } + // + // Make this type a range, for both Boost.Range, and C++11: + // + BidiIterator begin()const { return this->first; } + BidiIterator end()const { return this->second; } #ifdef BOOST_OLD_REGEX_H @@ -190,235 +195,235 @@ typedef sub_match<std::wstring::const_iterator> wssub_match; // comparison to std::basic_string<> part 1: template <class RandomAccessIterator, class traits, class Allocator> -inline bool operator == (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, +inline bool operator == (const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, const sub_match<RandomAccessIterator>& m) { return s.compare(m.str()) == 0; } template <class RandomAccessIterator, class traits, class Allocator> -inline bool operator != (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, +inline bool operator != (const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, const sub_match<RandomAccessIterator>& m) { return s.compare(m.str()) != 0; } template <class RandomAccessIterator, class traits, class Allocator> -inline bool operator < (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, +inline bool operator < (const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, const sub_match<RandomAccessIterator>& m) { return s.compare(m.str()) < 0; } template <class RandomAccessIterator, class traits, class Allocator> -inline bool operator <= (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, +inline bool operator <= (const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, const sub_match<RandomAccessIterator>& m) { return s.compare(m.str()) <= 0; } template <class RandomAccessIterator, class traits, class Allocator> -inline bool operator >= (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, +inline bool operator >= (const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, const sub_match<RandomAccessIterator>& m) { return s.compare(m.str()) >= 0; } template <class RandomAccessIterator, class traits, class Allocator> -inline bool operator > (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, +inline bool operator > (const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, const sub_match<RandomAccessIterator>& m) { return s.compare(m.str()) > 0; } // comparison to std::basic_string<> part 2: template <class RandomAccessIterator, class traits, class Allocator> inline bool operator == (const sub_match<RandomAccessIterator>& m, - const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) + const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) { return m.str().compare(s) == 0; } template <class RandomAccessIterator, class traits, class Allocator> inline bool operator != (const sub_match<RandomAccessIterator>& m, - const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) + const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) { return m.str().compare(s) != 0; } template <class RandomAccessIterator, class traits, class Allocator> inline bool operator < (const sub_match<RandomAccessIterator>& m, - const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) + const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) { return m.str().compare(s) < 0; } template <class RandomAccessIterator, class traits, class Allocator> inline bool operator > (const sub_match<RandomAccessIterator>& m, - const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) + const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) { return m.str().compare(s) > 0; } template <class RandomAccessIterator, class traits, class Allocator> inline bool operator <= (const sub_match<RandomAccessIterator>& m, - const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) + const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) { return m.str().compare(s) <= 0; } template <class RandomAccessIterator, class traits, class Allocator> inline bool operator >= (const sub_match<RandomAccessIterator>& m, - const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) + const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) { return m.str().compare(s) >= 0; } // comparison to const charT* part 1: template <class RandomAccessIterator> inline bool operator == (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s) { return m.str().compare(s) == 0; } template <class RandomAccessIterator> inline bool operator != (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s) { return m.str().compare(s) != 0; } template <class RandomAccessIterator> inline bool operator > (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s) { return m.str().compare(s) > 0; } template <class RandomAccessIterator> inline bool operator < (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s) { return m.str().compare(s) < 0; } template <class RandomAccessIterator> inline bool operator >= (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s) { return m.str().compare(s) >= 0; } template <class RandomAccessIterator> inline bool operator <= (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s) { return m.str().compare(s) <= 0; } // comparison to const charT* part 2: template <class RandomAccessIterator> -inline bool operator == (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline bool operator == (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(s) == 0; } template <class RandomAccessIterator> -inline bool operator != (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline bool operator != (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(s) != 0; } template <class RandomAccessIterator> -inline bool operator < (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline bool operator < (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(s) > 0; } template <class RandomAccessIterator> -inline bool operator > (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline bool operator > (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(s) < 0; } template <class RandomAccessIterator> -inline bool operator <= (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline bool operator <= (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(s) >= 0; } template <class RandomAccessIterator> -inline bool operator >= (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline bool operator >= (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(s) <= 0; } // comparison to const charT& part 1: template <class RandomAccessIterator> inline bool operator == (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s) { return m.str().compare(0, m.length(), &s, 1) == 0; } template <class RandomAccessIterator> inline bool operator != (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s) { return m.str().compare(0, m.length(), &s, 1) != 0; } template <class RandomAccessIterator> inline bool operator > (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s) { return m.str().compare(0, m.length(), &s, 1) > 0; } template <class RandomAccessIterator> inline bool operator < (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s) { return m.str().compare(0, m.length(), &s, 1) < 0; } template <class RandomAccessIterator> inline bool operator >= (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s) { return m.str().compare(0, m.length(), &s, 1) >= 0; } template <class RandomAccessIterator> inline bool operator <= (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s) { return m.str().compare(0, m.length(), &s, 1) <= 0; } // comparison to const charT* part 2: template <class RandomAccessIterator> -inline bool operator == (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s, +inline bool operator == (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(0, m.length(), &s, 1) == 0; } template <class RandomAccessIterator> -inline bool operator != (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s, +inline bool operator != (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(0, m.length(), &s, 1) != 0; } template <class RandomAccessIterator> -inline bool operator < (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s, +inline bool operator < (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(0, m.length(), &s, 1) > 0; } template <class RandomAccessIterator> -inline bool operator > (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s, +inline bool operator > (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(0, m.length(), &s, 1) < 0; } template <class RandomAccessIterator> -inline bool operator <= (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s, +inline bool operator <= (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(0, m.length(), &s, 1) >= 0; } template <class RandomAccessIterator> -inline bool operator >= (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s, +inline bool operator >= (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s, const sub_match<RandomAccessIterator>& m) { return m.str().compare(0, m.length(), &s, 1) <= 0; } // addition operators: template <class RandomAccessIterator, class traits, class Allocator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> -operator + (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> +operator + (const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s, const sub_match<RandomAccessIterator>& m) { - std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> result; + std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> result; result.reserve(s.size() + m.length() + 1); return result.append(s).append(m.first, m.second); } template <class RandomAccessIterator, class traits, class Allocator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> operator + (const sub_match<RandomAccessIterator>& m, - const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) + const std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s) { - std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> result; + std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator> result; result.reserve(s.size() + m.length() + 1); return result.append(m.first, m.second).append(s); } #if !(defined(__GNUC__) && defined(BOOST_NO_STD_LOCALE)) template <class RandomAccessIterator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> -operator + (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> +operator + (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { - std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> result; - result.reserve(std::char_traits<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type>::length(s) + m.length() + 1); + std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> result; + result.reserve(std::char_traits<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type>::length(s) + m.length() + 1); return result.append(s).append(m.first, m.second); } template <class RandomAccessIterator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> operator + (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const * s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const * s) { - std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> result; - result.reserve(std::char_traits<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type>::length(s) + m.length() + 1); + std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> result; + result.reserve(std::char_traits<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type>::length(s) + m.length() + 1); return result.append(m.first, m.second).append(s); } #else // worwaround versions: template <class RandomAccessIterator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> -operator + (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const* s, +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> +operator + (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const* s, const sub_match<RandomAccessIterator>& m) { return s + m.str(); } template <class RandomAccessIterator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> operator + (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const * s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const * s) { return m.str() + s; } #endif template <class RandomAccessIterator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> -operator + (typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s, +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> +operator + (typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s, const sub_match<RandomAccessIterator>& m) { - std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> result; + std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> result; result.reserve(m.length() + 2); return result.append(1, s).append(m.first, m.second); } template <class RandomAccessIterator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> operator + (const sub_match<RandomAccessIterator>& m, - typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type const& s) + typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type const& s) { - std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> result; + std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> result; result.reserve(m.length() + 2); return result.append(m.first, m.second).append(1, s); } template <class RandomAccessIterator> -inline std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> +inline std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> operator + (const sub_match<RandomAccessIterator>& m1, const sub_match<RandomAccessIterator>& m2) { - std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type> result; + std::basic_string<typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits<RandomAccessIterator>::value_type> result; result.reserve(m1.length() + m2.length() + 1); return result.append(m1.first, m1.second).append(m2.first, m2.second); } @@ -440,7 +445,7 @@ std::ostream& operator << (std::ostream& os, #endif #ifdef BOOST_OLD_REGEX_H -namespace re_detail{ +namespace BOOST_REGEX_DETAIL_NS{ template <class BidiIterator, class charT> int do_toi(BidiIterator i, BidiIterator j, char c, int radix) { @@ -479,7 +484,7 @@ sub_match<BidiIterator>::operator int()const neg = -1; ++i; } - neg *= re_detail::do_toi(i, j, *i); + neg *= BOOST_REGEX_DETAIL_NS::do_toi(i, j, *i); if(i != j)raise_regex_exception("Bad sub-expression"); return neg; } @@ -490,7 +495,7 @@ sub_match<BidiIterator>::operator unsigned int()const BidiIterator j = second; if(i == j) raise_regex_exception("Bad sub-expression"); - return re_detail::do_toi(i, j, *first); + return BOOST_REGEX_DETAIL_NS::do_toi(i, j, *first); } #endif |