Skip to content

Commit 217d292

Browse files
author
Hana Dusíková
committed
own filter for C++17
1 parent eb057f2 commit 217d292

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

single-header/ctre-unicode.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4668,15 +4668,13 @@ template <typename BeginIterator, typename EndIterator, typename RE, typename Re
46684668
template <typename... Ts> constexpr bool is_range<regex_split_range<Ts...>> = true;
46694669

46704670
template <typename Range, typename RE> struct multi_subject_range {
4671-
static constexpr bool is_input = std::is_same_v<std::iterator_traits<First>::iterator_category, std::input_iterator_tag>;
4672-
46734671
struct end_iterator { };
46744672

46754673
using first_type = decltype(std::declval<Range>().begin());
46764674
using last_type = decltype(std::declval<Range>().end());
46774675

46784676
struct iterator {
4679-
using value_type = decltype(RE::exec(std::declval<typename std::iterator_traits<First>::value_type>()));
4677+
using value_type = decltype(RE::exec(std::declval<typename std::iterator_traits<first_type>::value_type>()));
46804678
using iterator_category = std::forward_iterator_tag;
46814679
using pointer = void;
46824680
using reference = const value_type &;
@@ -4914,7 +4912,7 @@ template <typename RE, typename Method, typename Modifier> struct regular_expres
49144912
return Method::template exec<Modifier, ResultIterator>(begin, end, RE{});
49154913
}
49164914
template <typename Range> constexpr CTRE_FORCE_INLINE static auto multi_exec(Range && range) noexcept {
4917-
return multi_subject_range<decltype(range.begin()), decltype(range.end()), regular_expression>{range.begin(), range.end()};
4915+
return multi_subject_range<Range, regular_expression>{std::forward<Range>(range)};
49184916
}
49194917
constexpr CTRE_FORCE_INLINE static auto exec() noexcept {
49204918
return Method::template exec();

0 commit comments

Comments
 (0)