diff --git a/include/boost/regex/v3/regex.hpp b/include/boost/regex/v3/regex.hpp index ecf983dc..98f758c0 100644 --- a/include/boost/regex/v3/regex.hpp +++ b/include/boost/regex/v3/regex.hpp @@ -893,7 +893,7 @@ protected: { std::size_t cmatches; unsigned count; - sub_match head, tail, null; + sub_match head, tail, re_null; unsigned int lines; iterator line_pos, base; c_reference(const Allocator& a) @@ -947,7 +947,7 @@ public: { if((n >= 0) && ((unsigned int)n < ref->cmatches)) return *(sub_match*)((char*)ref + sizeof(c_reference) + sizeof(sub_match)*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; @@ -1296,8 +1296,8 @@ void BOOST_REGEX_CALL match_results_base::set_size(size_typ ref->head.first = i; ref->tail.second = j; ref->head.matched = ref->tail.matched = true; - ref->null.first = ref->null.second = j; - ref->null.matched = false; + ref->re_null.first = ref->re_null.second = j; + ref->re_null.matched = false; } template