summaryrefslogtreecommitdiff
path: root/src/ranges.hh
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2020-02-18 19:28:10 +1100
committerMaxime Coste <mawww@kakoune.org>2020-02-18 19:28:41 +1100
commit3ef8a6160ddb8e5012d49a194771e8bc24d38121 (patch)
tree956db4504657c0181e844c06c614a06f048dc740 /src/ranges.hh
parent60782b3dc93b7bbc38e148e85dffe2f1ad6a4542 (diff)
Small code style tweak in ranges.hh
Diffstat (limited to 'src/ranges.hh')
-rw-r--r--src/ranges.hh18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ranges.hh b/src/ranges.hh
index 02757283..2f288d0f 100644
--- a/src/ranges.hh
+++ b/src/ranges.hh
@@ -184,8 +184,8 @@ struct TransformView
Iterator& operator+=(difference_type diff) { m_it += diff; return *this; }
Iterator& operator-=(difference_type diff) { m_it -= diff; return *this; }
- Iterator operator+(difference_type diff) { return {*m_transform, m_it + diff}; }
- Iterator operator-(difference_type diff) { return {*m_transform, m_it - diff}; }
+ Iterator operator+(difference_type diff) const { return {*m_transform, m_it + diff}; }
+ Iterator operator-(difference_type diff) const { return {*m_transform, m_it - diff}; }
friend bool operator==(const Iterator& lhs, const Iterator& rhs) { return lhs.m_it == rhs.m_it; }
friend bool operator!=(const Iterator& lhs, const Iterator& rhs) { return not (lhs == rhs); }
@@ -480,8 +480,8 @@ auto gather()
});
}
-template<typename ExceptionType, size_t... Indexes>
-auto elements(bool exact_size = false)
+template<typename ExceptionType, bool exact_size, size_t... Indexes>
+auto elements()
{
return make_view_factory([=] (auto&& range) {
using std::begin; using std::end;
@@ -500,16 +500,16 @@ auto elements(bool exact_size = false)
});
}
-template<typename ExceptionType, size_t... Indexes>
-auto static_gather_impl(std::index_sequence<Indexes...>, bool exact_size)
+template<typename ExceptionType, bool exact_size, size_t... Indexes>
+auto static_gather_impl(std::index_sequence<Indexes...>)
{
- return elements<ExceptionType, Indexes...>(exact_size);
+ return elements<ExceptionType, exact_size, Indexes...>();
}
-template<typename ExceptionType, size_t size, bool exact_size=true>
+template<typename ExceptionType, size_t size, bool exact_size = true>
auto static_gather()
{
- return static_gather_impl<ExceptionType>(std::make_index_sequence<size>(), exact_size);
+ return static_gather_impl<ExceptionType, exact_size>(std::make_index_sequence<size>());
}
}