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

[iter] Rename

This commit is contained in:
Behdad Esfahbod 2018-12-28 21:22:26 -05:00
parent 037f735efd
commit 0828db8444
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-ot-layout-common.hh
View File

@ -857,7 +857,7 @@ struct CoverageFormat1
public: public:
/* Older compilers need this to be public. */ /* Older compilers need this to be public. */
struct Iter struct iter_t
{ {
void init (const struct CoverageFormat1 &c_) { c = &c_; i = 0; } void init (const struct CoverageFormat1 &c_) { c = &c_; i = 0; }
void fini () {} void fini () {}
@ -971,7 +971,7 @@ struct CoverageFormat2
public: public:
/* Older compilers need this to be public. */ /* Older compilers need this to be public. */
struct Iter struct iter_t
{ {
void init (const CoverageFormat2 &c_) void init (const CoverageFormat2 &c_)
{ {
@ -1104,11 +1104,11 @@ struct Coverage
} }
} }
struct Iter : struct iter_t :
hb_sorted_iter_t<Iter, const hb_pair_t<unsigned, hb_codepoint_t> >, hb_sorted_iter_t<iter_t, const hb_pair_t<unsigned, hb_codepoint_t> >,
hb_iter_mixin_t<Iter, const hb_pair_t<unsigned, hb_codepoint_t> > hb_iter_mixin_t<iter_t, const hb_pair_t<unsigned, hb_codepoint_t> >
{ {
Iter (const Coverage &c_ = Null(Coverage)) iter_t (const Coverage &c_ = Null(Coverage))
{ {
memset (this, 0, sizeof (*this)); memset (this, 0, sizeof (*this));
format = c_.u.format; format = c_.u.format;
@ -1162,11 +1162,11 @@ struct Coverage
private: private:
unsigned int format; unsigned int format;
union { union {
CoverageFormat2::Iter format2; /* Put this one first since it's larger; helps shut up compiler. */ CoverageFormat2::iter_t format2; /* Put this one first since it's larger; helps shut up compiler. */
CoverageFormat1::Iter format1; CoverageFormat1::iter_t format1;
} u; } u;
}; };
Iter iter () const { return Iter (*this); } iter_t iter () const { return iter_t (*this); }
protected: protected:
union { union {