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

[iter] Add back operator + 

Too ugly to remove..
This commit is contained in:
Behdad Esfahbod 2018-12-30 02:11:03 -05:00
parent 076faf7c18
commit 859a880b08
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-iter.hh
View File

@ -75,8 +75,8 @@ struct hb_iter_t
iter_t& operator ++ () { thiz()->__next__ (); return *thiz(); }
iter_t& operator -= (unsigned count) { thiz()->__rewind__ (count); return *thiz(); }
iter_t& operator -- () { thiz()->__prev__ (); return *thiz(); }
//TODO(C++11)iter_t operator + (unsigned count) const { iter_t c (*thiz()); c += count; return c; }
//TODO(C++11)friend iter_t operator + (unsigned count, const iter_t &it) { return it + count; }
iter_t operator + (unsigned count) const { iter_t c (*thiz()); c += count; return c; }
friend iter_t operator + (unsigned count, const iter_t &it) { return it + count; }
iter_t operator ++ (int) { iter_t c (*thiz()); ++*thiz(); return c; }
iter_t operator - (unsigned count) const { iter_t c (*thiz()); c -= count; return c; }
iter_t operator -- (int) { iter_t c (*thiz()); --*thiz(); return c; }
@ -103,7 +103,7 @@ struct hb_iter_t
using Name::operator ++; \
using Name::operator -=; \
using Name::operator --; \
/*TODO(C++11)using Name::operator +;*/ \
using Name::operator +; \
using Name::operator -; \
using Name::is_random_access; \
static_assert (true, "")

4
src/test-iter.cc
View File

@ -75,8 +75,8 @@ test_iterator (Iterator it)
*c;
it += it.len ();
//TODO(C++11)it = it + 10;
//TODO(C++11)it = 10 + it;
it = it + 10;
it = 10 + it;
assert (*it == it[0]);