summaryrefslogtreecommitdiffstats
path: root/contrib/libs/cxxsupp/libcxx/include/regex
diff options
context:
space:
mode:
authormikhnenko <[email protected]>2024-12-05 10:49:03 +0300
committermikhnenko <[email protected]>2024-12-05 11:21:12 +0300
commit681668b400e84754eb7acbc0e173491bb4dfc8b2 (patch)
treee809b0abb22e9c506c032e256effebcf9ea88dbd /contrib/libs/cxxsupp/libcxx/include/regex
parentfe60cde3cf1989964159845c2929a65056a8dcf3 (diff)
Update libcxx to 18 Dec 3b0705827dbe711788c6b6bec3afa94205db1ce8
commit_hash:875d8582c26b8bf016af25e00ad77d9bbf081948
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/include/regex')
-rw-r--r--contrib/libs/cxxsupp/libcxx/include/regex610
1 files changed, 309 insertions, 301 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/regex b/contrib/libs/cxxsupp/libcxx/include/regex
index e8865ac1089..008fe70a0ca 100644
--- a/contrib/libs/cxxsupp/libcxx/include/regex
+++ b/contrib/libs/cxxsupp/libcxx/include/regex
@@ -697,6 +697,7 @@ public:
typedef const value_type* pointer;
typedef const value_type& reference;
typedef forward_iterator_tag iterator_category;
+ typedef input_iterator_tag iterator_concept; // since C++20
regex_iterator();
regex_iterator(BidirectionalIterator a, BidirectionalIterator b,
@@ -737,6 +738,7 @@ public:
typedef const value_type* pointer;
typedef const value_type& reference;
typedef forward_iterator_tag iterator_category;
+ typedef input_iterator_tag iterator_concept; // since C++20
regex_token_iterator();
regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
@@ -869,7 +871,7 @@ syntax_option_type __get_grammar(syntax_option_type __g)
#endif
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
syntax_option_type
operator~(syntax_option_type __x)
@@ -877,7 +879,7 @@ operator~(syntax_option_type __x)
return syntax_option_type(~int(__x) & 0x1FF);
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
syntax_option_type
operator&(syntax_option_type __x, syntax_option_type __y)
@@ -885,7 +887,7 @@ operator&(syntax_option_type __x, syntax_option_type __y)
return syntax_option_type(int(__x) & int(__y));
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
syntax_option_type
operator|(syntax_option_type __x, syntax_option_type __y)
@@ -893,7 +895,7 @@ operator|(syntax_option_type __x, syntax_option_type __y)
return syntax_option_type(int(__x) | int(__y));
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
syntax_option_type
operator^(syntax_option_type __x, syntax_option_type __y)
@@ -901,7 +903,7 @@ operator^(syntax_option_type __x, syntax_option_type __y)
return syntax_option_type(int(__x) ^ int(__y));
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
syntax_option_type&
operator&=(syntax_option_type& __x, syntax_option_type __y)
{
@@ -909,7 +911,7 @@ operator&=(syntax_option_type& __x, syntax_option_type __y)
return __x;
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
syntax_option_type&
operator|=(syntax_option_type& __x, syntax_option_type __y)
{
@@ -917,7 +919,7 @@ operator|=(syntax_option_type& __x, syntax_option_type __y)
return __x;
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
syntax_option_type&
operator^=(syntax_option_type& __x, syntax_option_type __y)
{
@@ -946,7 +948,7 @@ enum match_flag_type
__full_match = 1 << 12
};
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
match_flag_type
operator~(match_flag_type __x)
@@ -954,7 +956,7 @@ operator~(match_flag_type __x)
return match_flag_type(~int(__x) & 0x0FFF);
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
match_flag_type
operator&(match_flag_type __x, match_flag_type __y)
@@ -962,7 +964,7 @@ operator&(match_flag_type __x, match_flag_type __y)
return match_flag_type(int(__x) & int(__y));
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
match_flag_type
operator|(match_flag_type __x, match_flag_type __y)
@@ -970,7 +972,7 @@ operator|(match_flag_type __x, match_flag_type __y)
return match_flag_type(int(__x) | int(__y));
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR
match_flag_type
operator^(match_flag_type __x, match_flag_type __y)
@@ -978,7 +980,7 @@ operator^(match_flag_type __x, match_flag_type __y)
return match_flag_type(int(__x) ^ int(__y));
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
match_flag_type&
operator&=(match_flag_type& __x, match_flag_type __y)
{
@@ -986,7 +988,7 @@ operator&=(match_flag_type& __x, match_flag_type __y)
return __x;
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
match_flag_type&
operator|=(match_flag_type& __x, match_flag_type __y)
{
@@ -994,7 +996,7 @@ operator|=(match_flag_type& __x, match_flag_type __y)
return __x;
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
match_flag_type&
operator^=(match_flag_type& __x, match_flag_type __y)
{
@@ -1033,12 +1035,12 @@ public:
explicit regex_error(regex_constants::error_type __ecode);
_LIBCPP_HIDE_FROM_ABI regex_error(const regex_error&) _NOEXCEPT = default;
~regex_error() _NOEXCEPT override;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
regex_constants::error_type code() const {return __code_;}
};
template <regex_constants::error_type _Ev>
-_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_NORETURN inline _LIBCPP_HIDE_FROM_ABI
void __throw_regex_error()
{
#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
@@ -1083,37 +1085,37 @@ private:
public:
regex_traits();
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
static size_t length(const char_type* __p)
{return char_traits<char_type>::length(__p);}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
char_type translate(char_type __c) const {return __c;}
char_type translate_nocase(char_type __c) const;
template <class _ForwardIterator>
string_type
transform(_ForwardIterator __f, _ForwardIterator __l) const;
template <class _ForwardIterator>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
string_type
transform_primary( _ForwardIterator __f, _ForwardIterator __l) const
{return __transform_primary(__f, __l, char_type());}
template <class _ForwardIterator>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
string_type
lookup_collatename(_ForwardIterator __f, _ForwardIterator __l) const
{return __lookup_collatename(__f, __l, char_type());}
template <class _ForwardIterator>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
char_class_type
lookup_classname(_ForwardIterator __f, _ForwardIterator __l,
bool __icase = false) const
{return __lookup_classname(__f, __l, __icase, char_type());}
bool isctype(char_type __c, char_class_type __m) const;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
int value(char_type __ch, int __radix) const
{return __regex_traits_value(__ch, __radix);}
locale_type imbue(locale_type __l);
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
locale_type getloc()const {return __loc_;}
private:
@@ -1147,11 +1149,11 @@ private:
#endif
static int __regex_traits_value(unsigned char __ch, int __radix);
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
int __regex_traits_value(char __ch, int __radix) const
{return __regex_traits_value(static_cast<unsigned char>(__ch), __radix);}
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
int __regex_traits_value(wchar_t __ch, int __radix) const;
#endif
};
@@ -1359,7 +1361,7 @@ regex_traits<_CharT>::isctype(char_type __c, char_class_type __m) const
return (__c == '_' && (__m & __regex_word));
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool __is_07(unsigned char __c)
{
return (__c & 0xF8u) ==
@@ -1370,7 +1372,7 @@ bool __is_07(unsigned char __c)
#endif
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool __is_89(unsigned char __c)
{
return (__c & 0xFEu) ==
@@ -1381,7 +1383,7 @@ bool __is_89(unsigned char __c)
#endif
}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
unsigned char __to_lower(unsigned char __c)
{
#if defined(__MVS__) && !defined(__NATIVE_ASCII_F)
@@ -1456,7 +1458,7 @@ struct __state
regex_constants::match_flag_type __flags_;
bool __at_first_;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__state()
: __do_(0), __first_(nullptr), __current_(nullptr), __last_(nullptr),
__node_(nullptr), __flags_(), __at_first_(false) {}
@@ -1470,9 +1472,9 @@ class __node
__node(const __node&);
__node& operator=(const __node&);
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__node() {}
_LIBCPP_HIDE_FROM_ABI_VIRTUAL
virtual ~__node() {}
@@ -1490,9 +1492,9 @@ class __end_state
: public __node<_CharT>
{
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__end_state() {}
_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void __exec(__state&) const;
@@ -1514,13 +1516,13 @@ class __has_one_state
__node<_CharT>* __first_;
public:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __has_one_state(__node<_CharT>* __s)
: __first_(__s) {}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__node<_CharT>* first() const {return __first_;}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__node<_CharT>*& first() {return __first_;}
};
@@ -1533,7 +1535,7 @@ class __owns_one_state
typedef __has_one_state<_CharT> base;
public:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __owns_one_state(__node<_CharT>* __s)
: base(__s) {}
@@ -1555,9 +1557,9 @@ class __empty_state
typedef __owns_one_state<_CharT> base;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __empty_state(__node<_CharT>* __s)
: base(__s) {}
@@ -1581,9 +1583,9 @@ class __empty_non_own_state
typedef __has_one_state<_CharT> base;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __empty_non_own_state(__node<_CharT>* __s)
: base(__s) {}
@@ -1607,9 +1609,9 @@ class __repeat_one_loop
typedef __has_one_state<_CharT> base;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __repeat_one_loop(__node<_CharT>* __s)
: base(__s) {}
@@ -1635,15 +1637,15 @@ class __owns_two_states
base* __second_;
public:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __owns_two_states(__node<_CharT>* __s1, base* __s2)
: base(__s1), __second_(__s2) {}
_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual ~__owns_two_states();
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
base* second() const {return __second_;}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
base*& second() {return __second_;}
};
@@ -1669,9 +1671,9 @@ class __loop
bool __greedy_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __loop(unsigned __loop_id,
__node<_CharT>* __s1, __owns_one_state<_CharT>* __s2,
unsigned __mexp_begin, unsigned __mexp_end,
@@ -1686,7 +1688,7 @@ public:
_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void __exec_split(bool __second, __state& __s) const;
private:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __init_repeat(__state& __s) const
{
__s.__loop_data_[__loop_id_].second = __s.__current_;
@@ -1768,9 +1770,9 @@ class __alternate
typedef __owns_two_states<_CharT> base;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __alternate(__owns_one_state<_CharT>* __s1,
__owns_one_state<_CharT>* __s2)
: base(__s1, __s2) {}
@@ -1807,9 +1809,9 @@ class __begin_marked_subexpression
unsigned __mexp_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __begin_marked_subexpression(unsigned __mexp, __node<_CharT>* __s)
: base(__s), __mexp_(__mexp) {}
@@ -1835,9 +1837,9 @@ class __end_marked_subexpression
unsigned __mexp_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __end_marked_subexpression(unsigned __mexp, __node<_CharT>* __s)
: base(__s), __mexp_(__mexp) {}
@@ -1864,9 +1866,9 @@ class __back_ref
unsigned __mexp_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __back_ref(unsigned __mexp, __node<_CharT>* __s)
: base(__s), __mexp_(__mexp) {}
@@ -1884,7 +1886,7 @@ __back_ref<_CharT>::__exec(__state& __s) const
{
ptrdiff_t __len = __sm.second - __sm.first;
if (__s.__last_ - __s.__current_ >= __len &&
- _VSTD::equal(__sm.first, __sm.second, __s.__current_))
+ std::equal(__sm.first, __sm.second, __s.__current_))
{
__s.__do_ = __state::__accept_but_not_consume;
__s.__current_ += __len;
@@ -1914,9 +1916,9 @@ class __back_ref_icase
_Traits __traits_;
unsigned __mexp_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __back_ref_icase(const _Traits& __traits, unsigned __mexp,
__node<_CharT>* __s)
: base(__s), __traits_(__traits), __mexp_(__mexp) {}
@@ -1969,9 +1971,9 @@ class __back_ref_collate
_Traits __traits_;
unsigned __mexp_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __back_ref_collate(const _Traits& __traits, unsigned __mexp,
__node<_CharT>* __s)
: base(__s), __traits_(__traits), __mexp_(__mexp) {}
@@ -2024,9 +2026,9 @@ class __word_boundary
_Traits __traits_;
bool __invert_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit __word_boundary(const _Traits& __traits, bool __invert,
__node<_CharT>* __s)
: base(__s), __traits_(__traits), __invert_(__invert) {}
@@ -2086,7 +2088,7 @@ __word_boundary<_CharT, _Traits>::__exec(__state& __s) const
// __l_anchor
template <class _CharT>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
bool __is_eol(_CharT __c)
{
return __c == '\r' || __c == '\n';
@@ -2101,9 +2103,9 @@ class __l_anchor_multiline
bool __multiline_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__l_anchor_multiline(bool __multiline, __node<_CharT>* __s)
: base(__s), __multiline_(__multiline) {}
@@ -2122,7 +2124,7 @@ __l_anchor_multiline<_CharT>::__exec(__state& __s) const
}
else if (__multiline_ &&
!__s.__at_first_ &&
- std::__is_eol(*_VSTD::prev(__s.__current_)))
+ std::__is_eol(*std::prev(__s.__current_)))
{
__s.__do_ = __state::__accept_but_not_consume;
__s.__node_ = this->first();
@@ -2145,9 +2147,9 @@ class __r_anchor_multiline
bool __multiline_;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__r_anchor_multiline(bool __multiline, __node<_CharT>* __s)
: base(__s), __multiline_(__multiline) {}
@@ -2185,9 +2187,9 @@ class __match_any
typedef __owns_one_state<_CharT> base;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__match_any(__node<_CharT>* __s)
: base(__s) {}
@@ -2220,9 +2222,9 @@ class __match_any_but_newline
typedef __owns_one_state<_CharT> base;
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__match_any_but_newline(__node<_CharT>* __s)
: base(__s) {}
@@ -2247,9 +2249,9 @@ class __match_char
__match_char(const __match_char&);
__match_char& operator=(const __match_char&);
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__match_char(_CharT __c, __node<_CharT>* __s)
: base(__s), __c_(__c) {}
@@ -2287,9 +2289,9 @@ class __match_char_icase
__match_char_icase(const __match_char_icase&);
__match_char_icase& operator=(const __match_char_icase&);
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__match_char_icase(const _Traits& __traits, _CharT __c, __node<_CharT>* __s)
: base(__s), __traits_(__traits), __c_(__traits.translate_nocase(__c)) {}
@@ -2328,9 +2330,9 @@ class __match_char_collate
__match_char_collate(const __match_char_collate&);
__match_char_collate& operator=(const __match_char_collate&);
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__match_char_collate(const _Traits& __traits, _CharT __c, __node<_CharT>* __s)
: base(__s), __traits_(__traits), __c_(__traits.translate(__c)) {}
@@ -2380,9 +2382,9 @@ class __bracket_expression
__bracket_expression(const __bracket_expression&);
__bracket_expression& operator=(const __bracket_expression&);
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__bracket_expression(const _Traits& __traits, __node<_CharT>* __s,
bool __negate, bool __icase, bool __collate)
: base(__s), __traits_(__traits), __mask_(), __neg_mask_(),
@@ -2391,10 +2393,10 @@ public:
_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void __exec(__state&) const;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
bool __negated() const {return __negate_;}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __add_char(_CharT __c)
{
if (__icase_)
@@ -2404,7 +2406,7 @@ public:
else
__chars_.push_back(__c);
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __add_neg_char(_CharT __c)
{
if (__icase_)
@@ -2414,7 +2416,7 @@ public:
else
__neg_chars_.push_back(__c);
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __add_range(string_type __b, string_type __e)
{
if (__collate_)
@@ -2446,10 +2448,10 @@ public:
__b[0] = __traits_.translate_nocase(__b[0]);
__e[0] = __traits_.translate_nocase(__e[0]);
}
- __ranges_.push_back(std::make_pair(_VSTD::move(__b), _VSTD::move(__e)));
+ __ranges_.push_back(std::make_pair(std::move(__b), std::move(__e)));
}
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __add_digraph(_CharT __c1, _CharT __c2)
{
if (__icase_)
@@ -2461,13 +2463,13 @@ public:
else
__digraphs_.push_back(std::make_pair(__c1, __c2));
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __add_equivalence(const string_type& __s)
{__equivalences_.push_back(__s);}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __add_class(typename regex_traits<_CharT>::char_class_type __mask)
{__mask_ |= __mask;}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __add_neg_class(typename regex_traits<_CharT>::char_class_type __mask)
{__neg_mask_ |= __mask;}
};
@@ -2483,7 +2485,7 @@ __bracket_expression<_CharT, _Traits>::__exec(__state& __s) const
++__consumed;
if (__might_have_digraph_)
{
- const _CharT* __next = _VSTD::next(__s.__current_);
+ const _CharT* __next = std::next(__s.__current_);
if (__next != __s.__last_)
{
pair<_CharT, _CharT> __ch2(*__s.__current_, *__next);
@@ -2577,7 +2579,7 @@ __bracket_expression<_CharT, _Traits>::__exec(__state& __s) const
{
const bool __in_neg_mask = __traits_.isctype(__ch, __neg_mask_);
const bool __in_neg_chars =
- _VSTD::find(__neg_chars_.begin(), __neg_chars_.end(), __ch) !=
+ std::find(__neg_chars_.begin(), __neg_chars_.end(), __ch) !=
__neg_chars_.end();
if (!(__in_neg_mask || __in_neg_chars))
{
@@ -2667,8 +2669,8 @@ private:
shared_ptr<__empty_state<_CharT> > __start_;
__owns_one_state<_CharT>* __end_;
- typedef _VSTD::__state<_CharT> __state;
- typedef _VSTD::__node<_CharT> __node;
+ typedef std::__state<_CharT> __state;
+ typedef std::__node<_CharT> __node;
public:
// constants:
@@ -2685,12 +2687,12 @@ public:
static const regex_constants::syntax_option_type multiline = regex_constants::multiline;
// construct/copy/destroy:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex()
: __flags_(regex_constants::ECMAScript), __marked_count_(0), __loop_count_(0), __open_count_(0),
__end_(nullptr)
{}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit basic_regex(const value_type* __p, flag_type __f = regex_constants::ECMAScript)
: __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
__end_(nullptr)
@@ -2698,7 +2700,7 @@ public:
__init(__p, __p + __traits_.length(__p));
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex(const value_type* __p, size_t __len, flag_type __f = regex_constants::ECMAScript)
: __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
__end_(nullptr)
@@ -2709,7 +2711,7 @@ public:
// basic_regex(const basic_regex&) = default;
// basic_regex(basic_regex&&) = default;
template <class _ST, class _SA>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
explicit basic_regex(const basic_string<value_type, _ST, _SA>& __p,
flag_type __f = regex_constants::ECMAScript)
: __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
@@ -2719,7 +2721,7 @@ public:
}
template <class _ForwardIterator>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex(_ForwardIterator __first, _ForwardIterator __last,
flag_type __f = regex_constants::ECMAScript)
: __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
@@ -2728,7 +2730,7 @@ public:
__init(__first, __last);
}
#ifndef _LIBCPP_CXX03_LANG
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex(initializer_list<value_type> __il,
flag_type __f = regex_constants::ECMAScript)
: __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
@@ -2742,42 +2744,42 @@ public:
// basic_regex& operator=(const basic_regex&) = default;
// basic_regex& operator=(basic_regex&&) = default;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& operator=(const value_type* __p)
{return assign(__p);}
#ifndef _LIBCPP_CXX03_LANG
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& operator=(initializer_list<value_type> __il)
{return assign(__il);}
#endif // _LIBCPP_CXX03_LANG
template <class _ST, class _SA>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& operator=(const basic_string<value_type, _ST, _SA>& __p)
{return assign(__p);}
// assign:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& assign(const basic_regex& __that)
{return *this = __that;}
#ifndef _LIBCPP_CXX03_LANG
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& assign(basic_regex&& __that) _NOEXCEPT
- {return *this = _VSTD::move(__that);}
+ {return *this = std::move(__that);}
#endif
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& assign(const value_type* __p, flag_type __f = regex_constants::ECMAScript)
{return assign(__p, __p + __traits_.length(__p), __f);}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& assign(const value_type* __p, size_t __len, flag_type __f = regex_constants::ECMAScript)
{return assign(__p, __p + __len, __f);}
template <class _ST, class _SA>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& assign(const basic_string<value_type, _ST, _SA>& __s,
flag_type __f = regex_constants::ECMAScript)
{return assign(__s.begin(), __s.end(), __f);}
template <class _InputIterator, __enable_if_t<__has_exactly_input_iterator_category<_InputIterator>::value, int> = 0>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex&
assign(_InputIterator __first, _InputIterator __last,
flag_type __f = regex_constants::ECMAScript)
@@ -2787,7 +2789,7 @@ public:
}
private:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __member_init(flag_type __f)
{
__flags_ = __f;
@@ -2799,7 +2801,7 @@ private:
public:
template <class _ForwardIterator, __enable_if_t<__has_forward_iterator_category<_ForwardIterator>::value, int> = 0>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex&
assign(_ForwardIterator __first, _ForwardIterator __last,
flag_type __f = regex_constants::ECMAScript)
@@ -2809,7 +2811,7 @@ public:
#ifndef _LIBCPP_CXX03_LANG
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_regex& assign(initializer_list<value_type> __il,
flag_type __f = regex_constants::ECMAScript)
{return assign(__il.begin(), __il.end(), __f);}
@@ -2817,30 +2819,30 @@ public:
#endif // _LIBCPP_CXX03_LANG
// const operations:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
unsigned mark_count() const {return __marked_count_;}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
flag_type flags() const {return __flags_;}
// locale:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
locale_type imbue(locale_type __loc)
{
__member_init(ECMAScript);
__start_.reset();
return __traits_.imbue(__loc);
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
locale_type getloc() const {return __traits_.getloc();}
// swap:
void swap(basic_regex& __r);
private:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
unsigned __loop_count() const {return __loop_count_;}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
bool __use_multiline() const
{
return __get_grammar(__flags_) == ECMAScript && (__flags_ & multiline);
@@ -2991,17 +2993,17 @@ private:
bool __test_back_ref(_CharT);
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __push_l_anchor();
void __push_r_anchor();
void __push_match_any();
void __push_match_any_but_newline();
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __push_greedy_inf_repeat(size_t __min, __owns_one_state<_CharT>* __s,
unsigned __mexp_begin = 0, unsigned __mexp_end = 0)
{__push_loop(__min, numeric_limits<size_t>::max(), __s,
__mexp_begin, __mexp_end);}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __push_nongreedy_inf_repeat(size_t __min, __owns_one_state<_CharT>* __s,
unsigned __mexp_begin = 0, unsigned __mexp_end = 0)
{__push_loop(__min, numeric_limits<size_t>::max(), __s,
@@ -3137,7 +3139,7 @@ template <class _CharT, class _Traits>
void
basic_regex<_CharT, _Traits>::swap(basic_regex& __r)
{
- using _VSTD::swap;
+ using std::swap;
swap(__traits_, __r.__traits_);
swap(__flags_, __r.__flags_);
swap(__marked_count_, __r.__marked_count_);
@@ -3148,7 +3150,7 @@ basic_regex<_CharT, _Traits>::swap(basic_regex& __r)
}
template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
void
swap(basic_regex<_CharT, _Traits>& __x, basic_regex<_CharT, _Traits>& __y)
{
@@ -3170,9 +3172,9 @@ class __lookahead
__lookahead(const __lookahead&);
__lookahead& operator=(const __lookahead&);
public:
- typedef _VSTD::__state<_CharT> __state;
+ typedef std::__state<_CharT> __state;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
__lookahead(const basic_regex<_CharT, _Traits>& __exp, bool __invert, __node<_CharT>* __s, unsigned __mexp)
: base(__s), __exp_(__exp), __mexp_(__mexp), __invert_(__invert) {}
@@ -3271,7 +3273,7 @@ basic_regex<_CharT, _Traits>::__parse_basic_reg_exp(_ForwardIterator __first,
__first = __parse_RE_expression(__first, __last);
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp == __last && *__first == '$')
{
__push_r_anchor();
@@ -3488,7 +3490,7 @@ basic_regex<_CharT, _Traits>::__parse_Back_open_paren(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == '(')
@@ -3506,7 +3508,7 @@ basic_regex<_CharT, _Traits>::__parse_Back_close_paren(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == ')')
@@ -3524,7 +3526,7 @@ basic_regex<_CharT, _Traits>::__parse_Back_open_brace(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == '{')
@@ -3542,7 +3544,7 @@ basic_regex<_CharT, _Traits>::__parse_Back_close_brace(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == '}')
@@ -3560,7 +3562,7 @@ basic_regex<_CharT, _Traits>::__parse_BACKREF(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last && *__first == '\\' && __test_back_ref(*__temp))
__first = ++__temp;
}
@@ -3575,7 +3577,7 @@ basic_regex<_CharT, _Traits>::__parse_ORD_CHAR(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp == __last && *__first == '$')
return __first;
// Not called inside a bracket
@@ -3633,7 +3635,7 @@ basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last)
{
if (*__first == '\\')
@@ -3664,7 +3666,7 @@ basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR_ERE(_ForwardIterator __first,
{
if (__first != __last)
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last)
{
if (*__first == '\\')
@@ -3945,7 +3947,7 @@ basic_regex<_CharT, _Traits>::__parse_expression_term(_ForwardIterator __first,
{
if (__first != __last && *__first != ']')
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
basic_string<_CharT> __start_range;
if (__temp != __last && *__first == '[')
{
@@ -3974,7 +3976,7 @@ basic_regex<_CharT, _Traits>::__parse_expression_term(_ForwardIterator __first,
}
if (__first != __last && *__first != ']')
{
- __temp = _VSTD::next(__first);
+ __temp = std::next(__first);
if (__temp != __last && *__first == '-' && *__temp != ']')
{
// parse a range
@@ -4000,7 +4002,7 @@ basic_regex<_CharT, _Traits>::__parse_expression_term(_ForwardIterator __first,
++__first;
}
}
- __ml->__add_range(_VSTD::move(__start_range), _VSTD::move(__end_range));
+ __ml->__add_range(std::move(__start_range), std::move(__end_range));
}
else if (!__start_range.empty())
{
@@ -4155,7 +4157,7 @@ basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first
// Found [=
// This means =] must exist
value_type __equal_close[2] = {'=', ']'};
- _ForwardIterator __temp = _VSTD::search(__first, __last, __equal_close,
+ _ForwardIterator __temp = std::search(__first, __last, __equal_close,
__equal_close+2);
if (__temp == __last)
__throw_regex_error<regex_constants::error_brack>();
@@ -4183,7 +4185,7 @@ basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first
__throw_regex_error<regex_constants::error_collate>();
}
}
- __first = _VSTD::next(__temp, 2);
+ __first = std::next(__temp, 2);
return __first;
}
@@ -4197,7 +4199,7 @@ basic_regex<_CharT, _Traits>::__parse_character_class(_ForwardIterator __first,
// Found [:
// This means :] must exist
value_type __colon_close[2] = {':', ']'};
- _ForwardIterator __temp = _VSTD::search(__first, __last, __colon_close,
+ _ForwardIterator __temp = std::search(__first, __last, __colon_close,
__colon_close+2);
if (__temp == __last)
__throw_regex_error<regex_constants::error_brack>();
@@ -4208,7 +4210,7 @@ basic_regex<_CharT, _Traits>::__parse_character_class(_ForwardIterator __first,
if (__class_type == 0)
__throw_regex_error<regex_constants::error_ctype>();
__ml->__add_class(__class_type);
- __first = _VSTD::next(__temp, 2);
+ __first = std::next(__temp, 2);
return __first;
}
@@ -4222,7 +4224,7 @@ basic_regex<_CharT, _Traits>::__parse_collating_symbol(_ForwardIterator __first,
// Found [.
// This means .] must exist
value_type __dot_close[2] = {'.', ']'};
- _ForwardIterator __temp = _VSTD::search(__first, __last, __dot_close,
+ _ForwardIterator __temp = std::search(__first, __last, __dot_close,
__dot_close+2);
if (__temp == __last)
__throw_regex_error<regex_constants::error_brack>();
@@ -4236,7 +4238,7 @@ basic_regex<_CharT, _Traits>::__parse_collating_symbol(_ForwardIterator __first,
default:
__throw_regex_error<regex_constants::error_collate>();
}
- __first = _VSTD::next(__temp, 2);
+ __first = std::next(__temp, 2);
return __first;
}
@@ -4347,7 +4349,7 @@ basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first,
break;
case '\\':
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last)
{
if (*__temp == 'b')
@@ -4365,7 +4367,7 @@ basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first,
break;
case '(':
{
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last && *__temp == '?')
{
if (++__temp != __last)
@@ -4378,7 +4380,7 @@ basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first,
__exp.__flags_ = __flags_;
__temp = __exp.__parse(++__temp, __last);
unsigned __mexp = __exp.__marked_count_;
- __push_lookahead(_VSTD::move(__exp), false, __marked_count_);
+ __push_lookahead(std::move(__exp), false, __marked_count_);
__marked_count_ += __mexp;
if (__temp == __last || *__temp != ')')
__throw_regex_error<regex_constants::error_paren>();
@@ -4391,7 +4393,7 @@ basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first,
__exp.__flags_ = __flags_;
__temp = __exp.__parse(++__temp, __last);
unsigned __mexp = __exp.__marked_count_;
- __push_lookahead(_VSTD::move(__exp), true, __marked_count_);
+ __push_lookahead(std::move(__exp), true, __marked_count_);
__marked_count_ += __mexp;
if (__temp == __last || *__temp != ')')
__throw_regex_error<regex_constants::error_paren>();
@@ -4433,7 +4435,7 @@ basic_regex<_CharT, _Traits>::__parse_atom(_ForwardIterator __first,
++__first;
if (__first == __last)
__throw_regex_error<regex_constants::error_paren>();
- _ForwardIterator __temp = _VSTD::next(__first);
+ _ForwardIterator __temp = std::next(__first);
if (__temp != __last && *__first == '?' && *__temp == ':')
{
++__open_count_;
@@ -4479,7 +4481,7 @@ basic_regex<_CharT, _Traits>::__parse_atom_escape(_ForwardIterator __first,
{
if (__first != __last && *__first == '\\')
{
- _ForwardIterator __t1 = _VSTD::next(__first);
+ _ForwardIterator __t1 = std::next(__first);
if (__t1 == __last)
__throw_regex_error<regex_constants::error_escape>();
@@ -4631,7 +4633,7 @@ basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first,
++__first;
break;
case 'c':
- if ((__t = _VSTD::next(__first)) != __last)
+ if ((__t = std::next(__first)) != __last)
{
if (('A' <= *__t && *__t <= 'Z') ||
('a' <= *__t && *__t <= 'z'))
@@ -4750,7 +4752,7 @@ basic_regex<_CharT, _Traits>::__parse_grep(_ForwardIterator __first,
_ForwardIterator __last)
{
__owns_one_state<_CharT>* __sa = __end_;
- _ForwardIterator __t1 = _VSTD::find(__first, __last, _CharT('\n'));
+ _ForwardIterator __t1 = std::find(__first, __last, _CharT('\n'));
if (__t1 != __first)
__parse_basic_reg_exp(__first, __t1);
else
@@ -4760,7 +4762,7 @@ basic_regex<_CharT, _Traits>::__parse_grep(_ForwardIterator __first,
++__first;
while (__first != __last)
{
- __t1 = _VSTD::find(__first, __last, _CharT('\n'));
+ __t1 = std::find(__first, __last, _CharT('\n'));
__owns_one_state<_CharT>* __sb = __end_;
if (__t1 != __first)
__parse_basic_reg_exp(__first, __t1);
@@ -4781,7 +4783,7 @@ basic_regex<_CharT, _Traits>::__parse_egrep(_ForwardIterator __first,
_ForwardIterator __last)
{
__owns_one_state<_CharT>* __sa = __end_;
- _ForwardIterator __t1 = _VSTD::find(__first, __last, _CharT('\n'));
+ _ForwardIterator __t1 = std::find(__first, __last, _CharT('\n'));
if (__t1 != __first)
__parse_extended_reg_exp(__first, __t1);
else
@@ -4791,7 +4793,7 @@ basic_regex<_CharT, _Traits>::__parse_egrep(_ForwardIterator __first,
++__first;
while (__first != __last)
{
- __t1 = _VSTD::find(__first, __last, _CharT('\n'));
+ __t1 = std::find(__first, __last, _CharT('\n'));
__owns_one_state<_CharT>* __sb = __end_;
if (__t1 != __first)
__parse_extended_reg_exp(__first, __t1);
@@ -5010,26 +5012,26 @@ public:
bool matched;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
_LIBCPP_CONSTEXPR sub_match() : matched() {}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
difference_type length() const
- {return matched ? _VSTD::distance(this->first, this->second) : 0;}
- _LIBCPP_INLINE_VISIBILITY
+ {return matched ? std::distance(this->first, this->second) : 0;}
+ _LIBCPP_HIDE_FROM_ABI
string_type str() const
{return matched ? string_type(this->first, this->second) : string_type();}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
operator string_type() const
{return str();}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
int compare(const sub_match& __s) const
{return str().compare(__s.str());}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
int compare(const string_type& __s) const
{return str().compare(__s);}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
int compare(const value_type* __s) const
{return str().compare(__s);}
@@ -5045,7 +5047,7 @@ public:
};
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator==(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
{
@@ -5062,7 +5064,7 @@ _LIBCPP_HIDE_FROM_ABI auto operator<=>(const sub_match<_BiIter>& __x, const sub_
}
#else // _LIBCPP_STD_VER >= 20
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
{
@@ -5070,7 +5072,7 @@ operator!=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
{
@@ -5078,7 +5080,7 @@ operator<(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
{
@@ -5086,7 +5088,7 @@ operator<=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
{
@@ -5094,7 +5096,7 @@ operator>=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
{
@@ -5102,7 +5104,7 @@ operator>(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator==(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
const sub_match<_BiIter>& __y)
@@ -5111,7 +5113,7 @@ operator==(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
const sub_match<_BiIter>& __y)
@@ -5120,7 +5122,7 @@ operator!=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
const sub_match<_BiIter>& __y)
@@ -5129,7 +5131,7 @@ operator<(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST,
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
const sub_match<_BiIter>& __y)
@@ -5138,7 +5140,7 @@ operator>(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST,
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool operator>=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
const sub_match<_BiIter>& __y)
{
@@ -5146,7 +5148,7 @@ bool operator>=(const basic_string<typename iterator_traits<_BiIter>::value_type
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
const sub_match<_BiIter>& __y)
@@ -5156,7 +5158,7 @@ operator<=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST
#endif // _LIBCPP_STD_VER >= 20
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator==(const sub_match<_BiIter>& __x,
const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
@@ -5173,7 +5175,7 @@ _LIBCPP_HIDE_FROM_ABI auto operator<=>(
}
#else // _LIBCPP_STD_VER >= 20
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(const sub_match<_BiIter>& __x,
const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
@@ -5182,7 +5184,7 @@ operator!=(const sub_match<_BiIter>& __x,
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<(const sub_match<_BiIter>& __x,
const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
@@ -5191,7 +5193,7 @@ operator<(const sub_match<_BiIter>& __x,
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool operator>(const sub_match<_BiIter>& __x,
const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
{
@@ -5199,7 +5201,7 @@ bool operator>(const sub_match<_BiIter>& __x,
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>=(const sub_match<_BiIter>& __x,
const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
@@ -5208,7 +5210,7 @@ operator>=(const sub_match<_BiIter>& __x,
}
template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<=(const sub_match<_BiIter>& __x,
const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
@@ -5217,7 +5219,7 @@ operator<=(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator==(typename iterator_traits<_BiIter>::value_type const* __x,
const sub_match<_BiIter>& __y)
@@ -5226,7 +5228,7 @@ operator==(typename iterator_traits<_BiIter>::value_type const* __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(typename iterator_traits<_BiIter>::value_type const* __x,
const sub_match<_BiIter>& __y)
@@ -5235,7 +5237,7 @@ operator!=(typename iterator_traits<_BiIter>::value_type const* __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<(typename iterator_traits<_BiIter>::value_type const* __x,
const sub_match<_BiIter>& __y)
@@ -5244,7 +5246,7 @@ operator<(typename iterator_traits<_BiIter>::value_type const* __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>(typename iterator_traits<_BiIter>::value_type const* __x,
const sub_match<_BiIter>& __y)
@@ -5253,7 +5255,7 @@ operator>(typename iterator_traits<_BiIter>::value_type const* __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>=(typename iterator_traits<_BiIter>::value_type const* __x,
const sub_match<_BiIter>& __y)
@@ -5262,7 +5264,7 @@ operator>=(typename iterator_traits<_BiIter>::value_type const* __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<=(typename iterator_traits<_BiIter>::value_type const* __x,
const sub_match<_BiIter>& __y)
@@ -5272,7 +5274,7 @@ operator<=(typename iterator_traits<_BiIter>::value_type const* __x,
#endif // _LIBCPP_STD_VER >= 20
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator==(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const* __y)
@@ -5288,7 +5290,7 @@ operator<=>(const sub_match<_BiIter>& __x, typename iterator_traits<_BiIter>::va
}
#else // _LIBCPP_STD_VER >= 20
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const* __y)
@@ -5297,7 +5299,7 @@ operator!=(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const* __y)
@@ -5306,7 +5308,7 @@ operator<(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const* __y)
@@ -5315,7 +5317,7 @@ operator>(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>=(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const* __y)
@@ -5324,7 +5326,7 @@ operator>=(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<=(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const* __y)
@@ -5333,7 +5335,7 @@ operator<=(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator==(typename iterator_traits<_BiIter>::value_type const& __x,
const sub_match<_BiIter>& __y)
@@ -5343,7 +5345,7 @@ operator==(typename iterator_traits<_BiIter>::value_type const& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(typename iterator_traits<_BiIter>::value_type const& __x,
const sub_match<_BiIter>& __y)
@@ -5352,7 +5354,7 @@ operator!=(typename iterator_traits<_BiIter>::value_type const& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<(typename iterator_traits<_BiIter>::value_type const& __x,
const sub_match<_BiIter>& __y)
@@ -5362,7 +5364,7 @@ operator<(typename iterator_traits<_BiIter>::value_type const& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>(typename iterator_traits<_BiIter>::value_type const& __x,
const sub_match<_BiIter>& __y)
@@ -5371,7 +5373,7 @@ operator>(typename iterator_traits<_BiIter>::value_type const& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>=(typename iterator_traits<_BiIter>::value_type const& __x,
const sub_match<_BiIter>& __y)
@@ -5380,7 +5382,7 @@ operator>=(typename iterator_traits<_BiIter>::value_type const& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<=(typename iterator_traits<_BiIter>::value_type const& __x,
const sub_match<_BiIter>& __y)
@@ -5390,7 +5392,7 @@ operator<=(typename iterator_traits<_BiIter>::value_type const& __x,
#endif // _LIBCPP_STD_VER >= 20
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator==(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const& __y)
@@ -5408,7 +5410,7 @@ operator<=>(const sub_match<_BiIter>& __x, typename iterator_traits<_BiIter>::va
}
#else // _LIBCPP_STD_VER >= 20
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const& __y)
@@ -5417,7 +5419,7 @@ operator!=(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const& __y)
@@ -5427,7 +5429,7 @@ operator<(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const& __y)
@@ -5436,7 +5438,7 @@ operator>(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator>=(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const& __y)
@@ -5445,7 +5447,7 @@ operator>=(const sub_match<_BiIter>& __x,
}
template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator<=(const sub_match<_BiIter>& __x,
typename iterator_traits<_BiIter>::value_type const& __y)
@@ -5455,7 +5457,7 @@ operator<=(const sub_match<_BiIter>& __x,
#endif // _LIBCPP_STD_VER >= 20
template <class _CharT, class _ST, class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
basic_ostream<_CharT, _ST>&
operator<<(basic_ostream<_CharT, _ST>& __os, const sub_match<_BiIter>& __m)
{
@@ -5514,63 +5516,63 @@ public:
// match_results& operator=(match_results&& __m) = default;
// ~match_results() = default;
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
bool ready() const {return __ready_;}
// size:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
size_type size() const _NOEXCEPT {return __matches_.size();}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
size_type max_size() const _NOEXCEPT {return __matches_.max_size();}
- _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI
bool empty() const _NOEXCEPT {return size() == 0;}
// element access:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
difference_type length(size_type __sub = 0) const
{
_LIBCPP_ASSERT_UNCATEGORIZED(ready(), "match_results::length() called when not ready");
return (*this)[__sub].length();
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
difference_type position(size_type __sub = 0) const
{
_LIBCPP_ASSERT_UNCATEGORIZED(ready(), "match_results::position() called when not ready");
- return _VSTD::distance(__position_start_, (*this)[__sub].first);
+ return std::distance(__position_start_, (*this)[__sub].first);
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
string_type str(size_type __sub = 0) const
{
_LIBCPP_ASSERT_UNCATEGORIZED(ready(), "match_results::str() called when not ready");
return (*this)[__sub].str();
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const_reference operator[](size_type __n) const
{
_LIBCPP_ASSERT_UNCATEGORIZED(ready(), "match_results::operator[]() called when not ready");
return __n < __matches_.size() ? __matches_[__n] : __unmatched_;
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const_reference prefix() const
{
_LIBCPP_ASSERT_UNCATEGORIZED(ready(), "match_results::prefix() called when not ready");
return __prefix_;
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const_reference suffix() const
{
_LIBCPP_ASSERT_UNCATEGORIZED(ready(), "match_results::suffix() called when not ready");
return __suffix_;
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const_iterator begin() const {return empty() ? __matches_.end() : __matches_.begin();}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const_iterator end() const {return __matches_.end();}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const_iterator cbegin() const {return empty() ? __matches_.end() : __matches_.begin();}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const_iterator cend() const {return __matches_.end();}
// format:
@@ -5580,13 +5582,13 @@ public:
const char_type* __fmt_last,
regex_constants::match_flag_type __flags = regex_constants::format_default) const;
template <class _OutputIter, class _ST, class _SA>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
_OutputIter
format(_OutputIter __output_iter, const basic_string<char_type, _ST, _SA>& __fmt,
regex_constants::match_flag_type __flags = regex_constants::format_default) const
{return format(__output_iter, __fmt.data(), __fmt.data() + __fmt.size(), __flags);}
template <class _ST, class _SA>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
basic_string<char_type, _ST, _SA>
format(const basic_string<char_type, _ST, _SA>& __fmt,
regex_constants::match_flag_type __flags = regex_constants::format_default) const
@@ -5596,7 +5598,7 @@ public:
__flags);
return __r;
}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
string_type
format(const char_type* __fmt,
regex_constants::match_flag_type __flags = regex_constants::format_default) const
@@ -5608,14 +5610,14 @@ public:
}
// allocator:
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
allocator_type get_allocator() const {return __matches_.get_allocator();}
// swap:
void swap(match_results& __m);
template <class _Bp, class _Ap>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
void __assign(_BidirectionalIterator __f, _BidirectionalIterator __l,
const match_results<_Bp, _Ap>& __m, bool __no_update_pos)
{
@@ -5623,18 +5625,18 @@ public:
__matches_.resize(__m.size());
for (size_type __i = 0; __i < __matches_.size(); ++__i)
{
- __matches_[__i].first = _VSTD::next(__f, _VSTD::distance(__mf, __m[__i].first));
- __matches_[__i].second = _VSTD::next(__f, _VSTD::distance(__mf, __m[__i].second));
+ __matches_[__i].first = std::next(__f, std::distance(__mf, __m[__i].first));
+ __matches_[__i].second = std::next(__f, std::distance(__mf, __m[__i].second));
__matches_[__i].matched = __m[__i].matched;
}
__unmatched_.first = __l;
__unmatched_.second = __l;
__unmatched_.matched = false;
- __prefix_.first = _VSTD::next(__f, _VSTD::distance(__mf, __m.prefix().first));
- __prefix_.second = _VSTD::next(__f, _VSTD::distance(__mf, __m.prefix().second));
+ __prefix_.first = std::next(__f, std::distance(__mf, __m.prefix().first));
+ __prefix_.second = std::next(__f, std::distance(__mf, __m.prefix().second));
__prefix_.matched = __m.prefix().matched;
- __suffix_.first = _VSTD::next(__f, _VSTD::distance(__mf, __m.suffix().first));
- __suffix_.second = _VSTD::next(__f, _VSTD::distance(__mf, __m.suffix().second));
+ __suffix_.first = std::next(__f, std::distance(__mf, __m.suffix().first));
+ __suffix_.second = std::next(__f, std::distance(__mf, __m.suffix().second));
__suffix_.matched = __m.suffix().matched;
if (!__no_update_pos)
__position_start_ = __prefix_.first;
@@ -5706,7 +5708,7 @@ match_results<_BidirectionalIterator, _Allocator>::format(_OutputIter __output_i
for (; __fmt_first != __fmt_last; ++__fmt_first)
{
if (*__fmt_first == '&')
- __output_iter = _VSTD::copy(__matches_[0].first, __matches_[0].second,
+ __output_iter = std::copy(__matches_[0].first, __matches_[0].second,
__output_iter);
else if (*__fmt_first == '\\' && __fmt_first + 1 != __fmt_last)
{
@@ -5714,7 +5716,7 @@ match_results<_BidirectionalIterator, _Allocator>::format(_OutputIter __output_i
if ('0' <= *__fmt_first && *__fmt_first <= '9')
{
size_t __i = *__fmt_first - '0';
- __output_iter = _VSTD::copy((*this)[__i].first,
+ __output_iter = std::copy((*this)[__i].first,
(*this)[__i].second, __output_iter);
}
else
@@ -5744,16 +5746,16 @@ match_results<_BidirectionalIterator, _Allocator>::format(_OutputIter __output_i
break;
case '&':
++__fmt_first;
- __output_iter = _VSTD::copy(__matches_[0].first, __matches_[0].second,
+ __output_iter = std::copy(__matches_[0].first, __matches_[0].second,
__output_iter);
break;
case '`':
++__fmt_first;
- __output_iter = _VSTD::copy(__prefix_.first, __prefix_.second, __output_iter);
+ __output_iter = std::copy(__prefix_.first, __prefix_.second, __output_iter);
break;
case '\'':
++__fmt_first;
- __output_iter = _VSTD::copy(__suffix_.first, __suffix_.second, __output_iter);
+ __output_iter = std::copy(__suffix_.first, __suffix_.second, __output_iter);
break;
default:
if ('0' <= __fmt_first[1] && __fmt_first[1] <= '9')
@@ -5768,7 +5770,7 @@ match_results<_BidirectionalIterator, _Allocator>::format(_OutputIter __output_i
__throw_regex_error<regex_constants::error_escape>();
__idx = 10 * __idx + *__fmt_first - '0';
}
- __output_iter = _VSTD::copy((*this)[__idx].first,
+ __output_iter = std::copy((*this)[__idx].first,
(*this)[__idx].second, __output_iter);
}
else
@@ -5793,7 +5795,7 @@ template <class _BidirectionalIterator, class _Allocator>
void
match_results<_BidirectionalIterator, _Allocator>::swap(match_results& __m)
{
- using _VSTD::swap;
+ using std::swap;
swap(__matches_, __m.__matches_);
swap(__unmatched_, __m.__unmatched_);
swap(__prefix_, __m.__prefix_);
@@ -5818,7 +5820,7 @@ operator==(const match_results<_BidirectionalIterator, _Allocator>& __x,
#if _LIBCPP_STD_VER < 20
template <class _BidirectionalIterator, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
operator!=(const match_results<_BidirectionalIterator, _Allocator>& __x,
const match_results<_BidirectionalIterator, _Allocator>& __y)
@@ -5828,7 +5830,7 @@ operator!=(const match_results<_BidirectionalIterator, _Allocator>& __x,
#endif
template <class _BidirectionalIterator, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
void
swap(match_results<_BidirectionalIterator, _Allocator>& __x,
match_results<_BidirectionalIterator, _Allocator>& __y)
@@ -5892,7 +5894,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_ecma(
break;
}
__m.__matches_[0].first = __first;
- __m.__matches_[0].second = _VSTD::next(__first, __s.__current_ - __first);
+ __m.__matches_[0].second = std::next(__first, __s.__current_ - __first);
__m.__matches_[0].matched = true;
for (unsigned __i = 0; __i < __s.__sub_matches_.size(); ++__i)
__m.__matches_[__i+1] = __s.__sub_matches_[__i];
@@ -5906,7 +5908,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_ecma(
__state __snext = __s;
__s.__node_->__exec_split(true, __s);
__snext.__node_->__exec_split(false, __snext);
- __states.push_back(_VSTD::move(__snext));
+ __states.push_back(std::move(__snext));
}
break;
case __state::__reject:
@@ -5932,7 +5934,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_posix_nosubs(
{
deque<__state> __states;
ptrdiff_t __highest_j = 0;
- ptrdiff_t __np = _VSTD::distance(__first, __last);
+ ptrdiff_t __np = std::distance(__first, __last);
__node* __st = __start_.get();
if (__st)
{
@@ -5983,7 +5985,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_posix_nosubs(
case __state::__consume_input:
break;
case __state::__accept_and_consume:
- __states.push_front(_VSTD::move(__s));
+ __states.push_front(std::move(__s));
__states.pop_back();
break;
case __state::__repeat:
@@ -5994,7 +5996,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_posix_nosubs(
__state __snext = __s;
__s.__node_->__exec_split(true, __s);
__snext.__node_->__exec_split(false, __snext);
- __states.push_back(_VSTD::move(__snext));
+ __states.push_back(std::move(__snext));
}
break;
case __state::__reject:
@@ -6008,7 +6010,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_posix_nosubs(
if (__matched)
{
__m.__matches_[0].first = __first;
- __m.__matches_[0].second = _VSTD::next(__first, __highest_j);
+ __m.__matches_[0].second = std::next(__first, __highest_j);
__m.__matches_[0].matched = true;
return true;
}
@@ -6027,7 +6029,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_posix_subs(
vector<__state> __states;
__state __best_state;
ptrdiff_t __highest_j = 0;
- ptrdiff_t __np = _VSTD::distance(__first, __last);
+ ptrdiff_t __np = std::distance(__first, __last);
__node* __st = __start_.get();
if (__st)
{
@@ -6093,7 +6095,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_posix_subs(
__state __snext = __s;
__s.__node_->__exec_split(true, __s);
__snext.__node_->__exec_split(false, __snext);
- __states.push_back(_VSTD::move(__snext));
+ __states.push_back(std::move(__snext));
}
break;
case __state::__reject:
@@ -6107,7 +6109,7 @@ basic_regex<_CharT, _Traits>::__match_at_start_posix_subs(
if (__matched)
{
__m.__matches_[0].first = __first;
- __m.__matches_[0].second = _VSTD::next(__first, __highest_j);
+ __m.__matches_[0].second = std::next(__first, __highest_j);
__m.__matches_[0].matched = true;
for (unsigned __i = 0; __i < __best_state.__sub_matches_.size(); ++__i)
__m.__matches_[__i+1] = __best_state.__sub_matches_[__i];
@@ -6176,7 +6178,7 @@ basic_regex<_CharT, _Traits>::__search(
}
template <class _BidirectionalIterator, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
match_results<_BidirectionalIterator, _Allocator>& __m,
@@ -6184,7 +6186,7 @@ regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
int __offset = (__flags & regex_constants::match_prev_avail) ? 1 : 0;
- basic_string<_CharT> __s(_VSTD::prev(__first, __offset), __last);
+ basic_string<_CharT> __s(std::prev(__first, __offset), __last);
match_results<const _CharT*> __mc;
bool __r = __e.__search(__s.data() + __offset, __s.data() + __s.size(), __mc, __flags);
__m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos);
@@ -6192,7 +6194,7 @@ regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
}
template <class _Iter, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(__wrap_iter<_Iter> __first,
__wrap_iter<_Iter> __last,
@@ -6207,7 +6209,7 @@ regex_search(__wrap_iter<_Iter> __first,
}
template <class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(const _CharT* __first, const _CharT* __last,
match_results<const _CharT*, _Allocator>& __m,
@@ -6218,7 +6220,7 @@ regex_search(const _CharT* __first, const _CharT* __last,
}
template <class _BidirectionalIterator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
const basic_regex<_CharT, _Traits>& __e,
@@ -6230,7 +6232,7 @@ regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
}
template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(const _CharT* __first, const _CharT* __last,
const basic_regex<_CharT, _Traits>& __e,
@@ -6241,7 +6243,7 @@ regex_search(const _CharT* __first, const _CharT* __last,
}
template <class _CharT, class _Allocator, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(const _CharT* __str, match_results<const _CharT*, _Allocator>& __m,
const basic_regex<_CharT, _Traits>& __e,
@@ -6251,17 +6253,17 @@ regex_search(const _CharT* __str, match_results<const _CharT*, _Allocator>& __m,
}
template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(const _CharT* __str, const basic_regex<_CharT, _Traits>& __e,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
match_results<const _CharT*> __m;
- return _VSTD::regex_search(__str, __m, __e, __flags);
+ return std::regex_search(__str, __m, __e, __flags);
}
template <class _ST, class _SA, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(const basic_string<_CharT, _ST, _SA>& __s,
const basic_regex<_CharT, _Traits>& __e,
@@ -6272,7 +6274,7 @@ regex_search(const basic_string<_CharT, _ST, _SA>& __s,
}
template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_search(const basic_string<_CharT, _ST, _SA>& __s,
match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
@@ -6303,7 +6305,7 @@ regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
const basic_regex<_CharT, _Traits>& __e,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
- bool __r = _VSTD::regex_search(
+ bool __r = std::regex_search(
__first, __last, __m, __e,
__flags | regex_constants::match_continuous |
regex_constants::__full_match);
@@ -6317,40 +6319,40 @@ regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
}
template <class _BidirectionalIterator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
const basic_regex<_CharT, _Traits>& __e,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
match_results<_BidirectionalIterator> __m;
- return _VSTD::regex_match(__first, __last, __m, __e, __flags);
+ return std::regex_match(__first, __last, __m, __e, __flags);
}
template <class _CharT, class _Allocator, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_match(const _CharT* __str, match_results<const _CharT*, _Allocator>& __m,
const basic_regex<_CharT, _Traits>& __e,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
- return _VSTD::regex_match(__str, __str + _Traits::length(__str), __m, __e, __flags);
+ return std::regex_match(__str, __str + _Traits::length(__str), __m, __e, __flags);
}
template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_match(const basic_string<_CharT, _ST, _SA>& __s,
match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
const basic_regex<_CharT, _Traits>& __e,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
- return _VSTD::regex_match(__s.begin(), __s.end(), __m, __e, __flags);
+ return std::regex_match(__s.begin(), __s.end(), __m, __e, __flags);
}
#if _LIBCPP_STD_VER >= 14
template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_match(const basic_string<_CharT, _ST, _SA>&& __s,
match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
@@ -6359,22 +6361,22 @@ regex_match(const basic_string<_CharT, _ST, _SA>&& __s,
#endif
template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_match(const _CharT* __str, const basic_regex<_CharT, _Traits>& __e,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
- return _VSTD::regex_match(__str, __str + _Traits::length(__str), __e, __flags);
+ return std::regex_match(__str, __str + _Traits::length(__str), __e, __flags);
}
template <class _ST, class _SA, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
bool
regex_match(const basic_string<_CharT, _ST, _SA>& __s,
const basic_regex<_CharT, _Traits>& __e,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
- return _VSTD::regex_match(__s.begin(), __s.end(), __e, __flags);
+ return std::regex_match(__s.begin(), __s.end(), __e, __flags);
}
// regex_iterator
@@ -6407,6 +6409,9 @@ public:
typedef const value_type* pointer;
typedef const value_type& reference;
typedef forward_iterator_tag iterator_category;
+#if _LIBCPP_STD_VER >= 20
+ typedef input_iterator_tag iterator_concept;
+#endif
private:
_BidirectionalIterator __begin_;
@@ -6433,17 +6438,17 @@ public:
_LIBCPP_HIDE_FROM_ABI bool operator==(default_sentinel_t) const { return *this == regex_iterator(); }
#endif
#if _LIBCPP_STD_VER < 20
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
bool operator!=(const regex_iterator& __x) const {return !(*this == __x);}
#endif
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
reference operator*() const {return __match_;}
- _LIBCPP_INLINE_VISIBILITY
- pointer operator->() const {return _VSTD::addressof(__match_);}
+ _LIBCPP_HIDE_FROM_ABI
+ pointer operator->() const {return std::addressof(__match_);}
regex_iterator& operator++();
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
regex_iterator operator++(int)
{
regex_iterator __t(*this);
@@ -6464,10 +6469,10 @@ regex_iterator<_BidirectionalIterator, _CharT, _Traits>::
const regex_type& __re, regex_constants::match_flag_type __m)
: __begin_(__a),
__end_(__b),
- __pregex_(_VSTD::addressof(__re)),
+ __pregex_(std::addressof(__re)),
__flags_(__m)
{
- _VSTD::regex_search(__begin_, __end_, __match_, *__pregex_, __flags_);
+ std::regex_search(__begin_, __end_, __match_, *__pregex_, __flags_);
}
template <class _BidirectionalIterator, class _CharT, class _Traits>
@@ -6499,7 +6504,7 @@ regex_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
__match_ = value_type();
return *this;
}
- else if (_VSTD::regex_search(__start, __end_, __match_, *__pregex_,
+ else if (std::regex_search(__start, __end_, __match_, *__pregex_,
__flags_ | regex_constants::match_not_null |
regex_constants::match_continuous))
return *this;
@@ -6507,7 +6512,7 @@ regex_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
++__start;
}
__flags_ |= regex_constants::match_prev_avail;
- if (!_VSTD::regex_search(__start, __end_, __match_, *__pregex_, __flags_))
+ if (!std::regex_search(__start, __end_, __match_, *__pregex_, __flags_))
__match_ = value_type();
return *this;
}
@@ -6542,6 +6547,9 @@ public:
typedef const value_type* pointer;
typedef const value_type& reference;
typedef forward_iterator_tag iterator_category;
+#if _LIBCPP_STD_VER >= 20
+ typedef input_iterator_tag iterator_concept;
+#endif
private:
typedef regex_iterator<_BidirectionalIterator, _CharT, _Traits> _Position;
@@ -6618,17 +6626,17 @@ public:
}
#endif
#if _LIBCPP_STD_VER < 20
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
bool operator!=(const regex_token_iterator& __x) const {return !(*this == __x);}
#endif
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const value_type& operator*() const {return *__result_;}
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
const value_type* operator->() const {return __result_;}
regex_token_iterator& operator++();
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_HIDE_FROM_ABI
regex_token_iterator operator++(int)
{
regex_token_iterator __t(*this);
@@ -6803,7 +6811,7 @@ regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
__establish_result();
else
{
- if (_VSTD::find(__subs_.begin(), __subs_.end(), -1) != __subs_.end()
+ if (std::find(__subs_.begin(), __subs_.end(), -1) != __subs_.end()
&& __prev->suffix().length() != 0)
{
__suffix_.matched = true;
@@ -6834,7 +6842,7 @@ regex_replace(_OutputIterator __output_iter,
if (__i == __eof)
{
if (!(__flags & regex_constants::format_no_copy))
- __output_iter = _VSTD::copy(__first, __last, __output_iter);
+ __output_iter = std::copy(__first, __last, __output_iter);
}
else
{
@@ -6842,21 +6850,21 @@ regex_replace(_OutputIterator __output_iter,
for (size_t __len = char_traits<_CharT>::length(__fmt); __i != __eof; ++__i)
{
if (!(__flags & regex_constants::format_no_copy))
- __output_iter = _VSTD::copy(__i->prefix().first, __i->prefix().second, __output_iter);
+ __output_iter = std::copy(__i->prefix().first, __i->prefix().second, __output_iter);
__output_iter = __i->format(__output_iter, __fmt, __fmt + __len, __flags);
__lm = __i->suffix();
if (__flags & regex_constants::format_first_only)
break;
}
if (!(__flags & regex_constants::format_no_copy))
- __output_iter = _VSTD::copy(__lm.first, __lm.second, __output_iter);
+ __output_iter = std::copy(__lm.first, __lm.second, __output_iter);
}
return __output_iter;
}
template <class _OutputIterator, class _BidirectionalIterator,
class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
_OutputIterator
regex_replace(_OutputIterator __output_iter,
_BidirectionalIterator __first, _BidirectionalIterator __last,
@@ -6864,12 +6872,12 @@ regex_replace(_OutputIterator __output_iter,
const basic_string<_CharT, _ST, _SA>& __fmt,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
- return _VSTD::regex_replace(__output_iter, __first, __last, __e, __fmt.c_str(), __flags);
+ return std::regex_replace(__output_iter, __first, __last, __e, __fmt.c_str(), __flags);
}
template <class _Traits, class _CharT, class _ST, class _SA, class _FST,
class _FSA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
basic_string<_CharT, _ST, _SA>
regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
const basic_regex<_CharT, _Traits>& __e,
@@ -6877,26 +6885,26 @@ regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
basic_string<_CharT, _ST, _SA> __r;
- _VSTD::regex_replace(std::back_inserter(__r), __s.begin(), __s.end(), __e,
+ std::regex_replace(std::back_inserter(__r), __s.begin(), __s.end(), __e,
__fmt.c_str(), __flags);
return __r;
}
template <class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
basic_string<_CharT, _ST, _SA>
regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
basic_string<_CharT, _ST, _SA> __r;
- _VSTD::regex_replace(std::back_inserter(__r), __s.begin(), __s.end(), __e,
+ std::regex_replace(std::back_inserter(__r), __s.begin(), __s.end(), __e,
__fmt, __flags);
return __r;
}
template <class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
basic_string<_CharT>
regex_replace(const _CharT* __s,
const basic_regex<_CharT, _Traits>& __e,
@@ -6904,14 +6912,14 @@ regex_replace(const _CharT* __s,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
basic_string<_CharT> __r;
- _VSTD::regex_replace(std::back_inserter(__r), __s,
+ std::regex_replace(std::back_inserter(__r), __s,
__s + char_traits<_CharT>::length(__s), __e,
__fmt.c_str(), __flags);
return __r;
}
template <class _Traits, class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
basic_string<_CharT>
regex_replace(const _CharT* __s,
const basic_regex<_CharT, _Traits>& __e,
@@ -6919,7 +6927,7 @@ regex_replace(const _CharT* __s,
regex_constants::match_flag_type __flags = regex_constants::match_default)
{
basic_string<_CharT> __r;
- _VSTD::regex_replace(std::back_inserter(__r), __s,
+ std::regex_replace(std::back_inserter(__r), __s,
__s + char_traits<_CharT>::length(__s), __e,
__fmt, __flags);
return __r;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-19 23:31:05 +0000