Skip to content

Commit 4ee9add

Browse files
author
Hana Dusíková
committed
another shadowing warning avoided (in regex_split_iterator)
1 parent a998d7f commit 4ee9add

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/ctre/iterators.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ template <typename BeginIterator, typename EndIterator, typename RE, typename Re
123123
constexpr CTRE_FORCE_INLINE regex_split_iterator(const regex_split_iterator &) noexcept = default;
124124
constexpr CTRE_FORCE_INLINE regex_split_iterator(regex_split_iterator &&) noexcept = default;
125125

126-
constexpr CTRE_FORCE_INLINE regex_split_iterator(BeginIterator begin, EndIterator end) noexcept: orig_begin{begin}, current{begin}, end{end}, current_match{RE::template exec_with_result_iterator<ResultIterator>(current, end)} {
126+
constexpr CTRE_FORCE_INLINE regex_split_iterator(BeginIterator begin, EndIterator last) noexcept: orig_begin{begin}, current{begin}, end{last}, current_match{RE::template exec_with_result_iterator<ResultIterator>(current, last)} {
127127
if (current_match) {
128128
modify_match();
129129
} else {

single-header/ctre-unicode.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4610,7 +4610,7 @@ template <typename BeginIterator, typename EndIterator, typename RE, typename Re
46104610
constexpr CTRE_FORCE_INLINE regex_split_iterator(const regex_split_iterator &) noexcept = default;
46114611
constexpr CTRE_FORCE_INLINE regex_split_iterator(regex_split_iterator &&) noexcept = default;
46124612

4613-
constexpr CTRE_FORCE_INLINE regex_split_iterator(BeginIterator begin, EndIterator end) noexcept: orig_begin{begin}, current{begin}, end{end}, current_match{RE::template exec_with_result_iterator<ResultIterator>(current, end)} {
4613+
constexpr CTRE_FORCE_INLINE regex_split_iterator(BeginIterator begin, EndIterator last) noexcept: orig_begin{begin}, current{begin}, end{last}, current_match{RE::template exec_with_result_iterator<ResultIterator>(current, last)} {
46144614
if (current_match) {
46154615
modify_match();
46164616
} else {

single-header/ctre.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4607,7 +4607,7 @@ template <typename BeginIterator, typename EndIterator, typename RE, typename Re
46074607
constexpr CTRE_FORCE_INLINE regex_split_iterator(const regex_split_iterator &) noexcept = default;
46084608
constexpr CTRE_FORCE_INLINE regex_split_iterator(regex_split_iterator &&) noexcept = default;
46094609

4610-
constexpr CTRE_FORCE_INLINE regex_split_iterator(BeginIterator begin, EndIterator end) noexcept: orig_begin{begin}, current{begin}, end{end}, current_match{RE::template exec_with_result_iterator<ResultIterator>(current, end)} {
4610+
constexpr CTRE_FORCE_INLINE regex_split_iterator(BeginIterator begin, EndIterator last) noexcept: orig_begin{begin}, current{begin}, end{last}, current_match{RE::template exec_with_result_iterator<ResultIterator>(current, last)} {
46114611
if (current_match) {
46124612
modify_match();
46134613
} else {

0 commit comments

Comments
 (0)