[constexpr] Use initializer instead of assignment
diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 4985d5e..32a18ef 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh
@@ -1821,8 +1821,7 @@ } /* TODO Speed up, using set overlap first? */ /* TODO(iter) Rewrite as dagger. */ - HBUINT16 k; /* TODO(constexpr) use constructor to initialize. */ - k = klass; + HBUINT16 k {klass}; const HBUINT16 *arr = classValue.arrayZ; for (unsigned int i = 0; i < count; i++) if (arr[i] == k && glyphs->has (startGlyph + i)) @@ -1995,8 +1994,7 @@ } /* TODO Speed up, using set overlap first? */ /* TODO(iter) Rewrite as dagger. */ - HBUINT16 k; /* TODO(constexpr) use constructor to initialize. */ - k = klass; + HBUINT16 k {klass}; const RangeRecord *arr = rangeRecord.arrayZ; for (unsigned int i = 0; i < count; i++) if (arr[i].value == k && arr[i].intersects (glyphs))
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index aa46bef..3a96565 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh
@@ -2323,12 +2323,7 @@ { c->copy (len); for (const auto g : it) - { - /* TODO(constexpr) Simplify. */ - HBUINT16 gid; - gid = g; - c->copy (gid); - } + c->copy (HBUINT16 {g}); } ChainRule* copy (hb_serialize_context_t *c,