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

Fix older compilers re '>>' at nested template declarations

This commit is contained in:
Behdad Esfahbod 2018-09-05 19:29:42 -07:00
parent a1e5e07c73
commit 1e6599f596
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-ot-layout-gsub-table.hh
View File

@ -110,8 +110,8 @@ struct SingleSubstFormat1
inline bool subset (hb_subset_context_t *c) const inline bool subset (hb_subset_context_t *c) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
hb_auto_t<hb_vector_t<GlyphID>> from; hb_auto_t<hb_vector_t<GlyphID> > from;
hb_auto_t<hb_vector_t<GlyphID>> to; hb_auto_t<hb_vector_t<GlyphID> > to;
hb_codepoint_t delta = deltaGlyphID; hb_codepoint_t delta = deltaGlyphID;
for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ()) for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ())
{ {
@ -216,8 +216,8 @@ struct SingleSubstFormat2
inline bool subset (hb_subset_context_t *c) const inline bool subset (hb_subset_context_t *c) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
hb_auto_t<hb_vector_t<GlyphID>> from; hb_auto_t<hb_vector_t<GlyphID> > from;
hb_auto_t<hb_vector_t<GlyphID>> to; hb_auto_t<hb_vector_t<GlyphID> > to;
for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ()) for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ())
{ {
if (!c->plan->glyphset->has (iter.get_glyph ())) if (!c->plan->glyphset->has (iter.get_glyph ()))

2
src/hb-subset.cc
View File

@ -65,7 +65,7 @@ _subset2 (hb_subset_plan_t *plan)
hb_bool_t result = false; hb_bool_t result = false;
if (source_blob->data) if (source_blob->data)
{ {
hb_auto_t<hb_vector_t<char>> buf; hb_auto_t<hb_vector_t<char> > buf;
unsigned int buf_size = _plan_estimate_subset_table_size (plan, source_blob->length); unsigned int buf_size = _plan_estimate_subset_table_size (plan, source_blob->length);
DEBUG_MSG(SUBSET, nullptr, "OT::%c%c%c%c initial estimated table size: %u bytes.", HB_UNTAG(tag), buf_size); DEBUG_MSG(SUBSET, nullptr, "OT::%c%c%c%c initial estimated table size: %u bytes.", HB_UNTAG(tag), buf_size);
if (unlikely (!buf.alloc (buf_size))) if (unlikely (!buf.alloc (buf_size)))