boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-17 14:22:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

renamed null re_null in case the compiler #defines null.

Browse Source 
[SVN r20240]
This commit is contained in:
John Maddock
2003-10-02 11:06:06 +00:00
parent 11ea8aab76
commit a669854a84
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/regex/v3/regex.hpp
View File

@ -893,7 +893,7 @@ protected:
{ {
std::size_t cmatches; std::size_t cmatches;
unsigned count; unsigned count;
sub_match<iterator> head, tail, null; sub_match<iterator> head, tail, re_null;
unsigned int lines; unsigned int lines;
iterator line_pos, base; iterator line_pos, base;
c_reference(const Allocator& a) c_reference(const Allocator& a)
@ -947,7 +947,7 @@ public:
{ {
if((n >= 0) && ((unsigned int)n < ref->cmatches)) if((n >= 0) && ((unsigned int)n < ref->cmatches))
return *(sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>)*n); return *(sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>)*n);
return (n == -1) ? ref->head : (n == -2) ? ref->tail : ref->null; return (n == -1) ? ref->head : (n == -2) ? ref->tail : ref->re_null;
} }
Allocator BOOST_REGEX_CALL allocator()const; Allocator BOOST_REGEX_CALL allocator()const;
@ -1296,8 +1296,8 @@ void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_typ
ref->head.first = i; ref->head.first = i;
ref->tail.second = j; ref->tail.second = j;
ref->head.matched = ref->tail.matched = true; ref->head.matched = ref->tail.matched = true;
ref->null.first = ref->null.second = j; ref->re_null.first = ref->re_null.second = j;
ref->null.matched = false; ref->re_null.matched = false;
} }
template <class iterator, class Allocator> template <class iterator, class Allocator>