diff options
Diffstat (limited to 'libcxx/include/regex')
| -rw-r--r-- | libcxx/include/regex | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex index a117c50f3984..850fe099df1e 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -1330,9 +1330,9 @@ regex_traits<_CharT>::isctype(char_type __c, char_class_type __m) const } inline _LIBCPP_INLINE_VISIBILITY -bool __is_07(unsigned char c) +bool __is_07(unsigned char __c) { - return (c & 0xF8u) == + return (__c & 0xF8u) == #if defined(__MVS__) && !defined(__NATIVE_ASCII_F) 0xF0; #else @@ -1341,9 +1341,9 @@ bool __is_07(unsigned char c) } inline _LIBCPP_INLINE_VISIBILITY -bool __is_89(unsigned char c) +bool __is_89(unsigned char __c) { - return (c & 0xFEu) == + return (__c & 0xFEu) == #if defined(__MVS__) && !defined(__NATIVE_ASCII_F) 0xF8; #else @@ -1352,12 +1352,12 @@ bool __is_89(unsigned char c) } inline _LIBCPP_INLINE_VISIBILITY -unsigned char __to_lower(unsigned char c) +unsigned char __to_lower(unsigned char __c) { #if defined(__MVS__) && !defined(__NATIVE_ASCII_F) return c & 0xBF; #else - return c | 0x20; + return __c | 0x20; #endif } @@ -2057,9 +2057,9 @@ __word_boundary<_CharT, _Traits>::__exec(__state& __s) const template <class _CharT> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR -bool __is_eol(_CharT c) +bool __is_eol(_CharT __c) { - return c == '\r' || c == '\n'; + return __c == '\r' || __c == '\n'; } template <class _CharT> @@ -2748,12 +2748,7 @@ public: template <class _InputIterator> _LIBCPP_INLINE_VISIBILITY - typename enable_if - < - __is_cpp17_input_iterator <_InputIterator>::value && - !__is_cpp17_forward_iterator<_InputIterator>::value, - basic_regex& - >::type + typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value, basic_regex&>::type assign(_InputIterator __first, _InputIterator __last, flag_type __f = regex_constants::ECMAScript) { @@ -2968,7 +2963,7 @@ private: __parse_awk_escape(_ForwardIterator __first, _ForwardIterator __last, basic_string<_CharT>* __str = nullptr); - bool __test_back_ref(_CharT c); + bool __test_back_ref(_CharT); _LIBCPP_INLINE_VISIBILITY void __push_l_anchor(); @@ -4787,9 +4782,9 @@ basic_regex<_CharT, _Traits>::__parse_egrep(_ForwardIterator __first, template <class _CharT, class _Traits> bool -basic_regex<_CharT, _Traits>::__test_back_ref(_CharT c) +basic_regex<_CharT, _Traits>::__test_back_ref(_CharT __c) { - unsigned __val = __traits_.value(c, 10); + unsigned __val = __traits_.value(__c, 10); if (__val >= 1 && __val <= 9) { if (__val > mark_count()) |