walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[iter] Actually fix previous commit 

The iter objects shouldn't not be const.  D'oh.
This commit is contained in:
Behdad Esfahbod 2019-05-08 10:02:30 -07:00
parent a66598e030
commit aa4ac13f0b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hb-iter.hh
View File

@ -316,7 +316,7 @@ static inline auto end (Iterable&& iterable) HB_AUTO_RETURN (hb_iter (iterable).
template <typename Lhs, typename Rhs, template <typename Lhs, typename Rhs,
hb_requires (hb_is_iterator (Lhs))> hb_requires (hb_is_iterator (Lhs))>
static inline auto static inline auto
operator | (Lhs lhs, const Rhs &rhs) HB_AUTO_RETURN (rhs (lhs)) operator | (Lhs&& lhs, Rhs&& rhs) HB_AUTO_RETURN (hb_forward<Rhs> (rhs) (hb_forward<Lhs> (lhs)))
/* hb_map(), hb_filter(), hb_reduce() */ /* hb_map(), hb_filter(), hb_reduce() */
@ -355,7 +355,7 @@ struct hb_map_iter_factory_t
template <typename Iter, template <typename Iter,
hb_requires (hb_is_iterator (Iter))> hb_requires (hb_is_iterator (Iter))>
hb_map_iter_t<Iter, Proj> hb_map_iter_t<Iter, Proj>
operator () (Iter it) const operator () (Iter it)
{ return hb_map_iter_t<Iter, Proj> (it, f); } { return hb_map_iter_t<Iter, Proj> (it, f); }
private: private:
@ -402,7 +402,7 @@ struct hb_filter_iter_factory_t
template <typename Iter, template <typename Iter,
hb_requires (hb_is_iterator (Iter))> hb_requires (hb_is_iterator (Iter))>
hb_filter_iter_t<Iter, Pred, Proj> hb_filter_iter_t<Iter, Pred, Proj>
operator () (Iter it) const operator () (Iter it)
{ return hb_filter_iter_t<Iter, Pred, Proj> (it, p, f); } { return hb_filter_iter_t<Iter, Pred, Proj> (it, p, f); }
private: private:
@ -428,7 +428,7 @@ struct hb_reduce_t
hb_requires (hb_is_iterator (Iter)), hb_requires (hb_is_iterator (Iter)),
typename AccuT = decltype (hb_declval (Redu) (hb_declval (InitT), hb_declval (typename Iter::item_t)))> typename AccuT = decltype (hb_declval (Redu) (hb_declval (InitT), hb_declval (typename Iter::item_t)))>
AccuT AccuT
operator () (Iter it) const operator () (Iter it)
{ {
AccuT value = init_value; AccuT value = init_value;
for (; it; ++it) for (; it; ++it)
@ -549,7 +549,7 @@ struct hb_apply_t
template <typename Iter, template <typename Iter,
hb_requires (hb_is_iterator (Iter))> hb_requires (hb_is_iterator (Iter))>
void operator () (Iter it) const void operator () (Iter it)
{ {
for (; it; ++it) for (; it; ++it)
(void) hb_invoke (a, *it); (void) hb_invoke (a, *it);
@ -579,7 +579,7 @@ struct hb_sink_t
template <typename Iter, template <typename Iter,
hb_requires (hb_is_iterator (Iter))> hb_requires (hb_is_iterator (Iter))>
void operator () (Iter it) const void operator () (Iter it)
{ {
for (; it; ++it) for (; it; ++it)
s << *it; s << *it;
@ -619,11 +619,11 @@ HB_FUNCOBJ (hb_drain);
template <typename Sink1, typename Sink2> template <typename Sink1, typename Sink2>
struct hb_unzip_t struct hb_unzip_t
{ {
hb_unzip_t (Sink1&& s1, Sink2&& s2) : s1 (s1), s2 (s2) {} hb_unzip_t (Sink1 s1, Sink2 s2) : s1 (s1), s2 (s2) {}
template <typename Iter, template <typename Iter,
hb_requires (hb_is_iterator (Iter))> hb_requires (hb_is_iterator (Iter))>
void operator () (Iter it) const void operator () (Iter it)
{ {
for (; it; ++it) for (; it; ++it)
{ {