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

Add HB_DISALLOW_COPY_AND_ASSIGN

This commit is contained in:
Behdad Esfahbod 2018-05-25 16:21:27 -07:00
parent fd3d004231
commit 6c2227640b
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hb-ot-map-private.hh
View File

@ -78,7 +78,6 @@ struct hb_ot_map_t
pause_func_t pause_func; pause_func_t pause_func;
}; };
hb_ot_map_t (void) { memset (this, 0, sizeof (*this)); } hb_ot_map_t (void) { memset (this, 0, sizeof (*this)); }
inline hb_mask_t get_global_mask (void) const { return global_mask; } inline hb_mask_t get_global_mask (void) const { return global_mask; }

4
src/hb-ot-shape-private.hh
View File

@ -99,9 +99,7 @@ struct hb_ot_shape_planner_t
} }
private: private:
/* No copy. */ HB_DISALLOW_COPY_AND_ASSIGN (hb_ot_shape_planner_t);
hb_ot_shape_planner_t (const hb_ot_shape_planner_t &);
hb_ot_shape_planner_t &operator = (const hb_ot_shape_planner_t &);
}; };

2
src/hb-ot-shape.cc
View File

@ -942,8 +942,6 @@ hb_ot_shape_glyphs_closure (hb_font_t *font,
unsigned int num_features, unsigned int num_features,
hb_set_t *glyphs) hb_set_t *glyphs)
{ {
hb_ot_shape_plan_t plan;
const char *shapers[] = {"ot", nullptr}; const char *shapers[] = {"ot", nullptr};
hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props, hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props,
features, num_features, shapers); features, num_features, shapers);

10
src/hb-private.hh
View File

@ -536,6 +536,13 @@ _hb_ceil_to_4 (unsigned int v)
* *
*/ */
#define HB_DISALLOW_ASSIGN(TypeName) \
void operator=(const TypeName&) = delete
#define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&) = delete; \
void operator=(const TypeName&) = delete
/* /*
* Static pools * Static pools
*/ */
@ -800,6 +807,9 @@ struct hb_vector_t
arrayZ = nullptr; arrayZ = nullptr;
allocated = len = 0; allocated = len = 0;
} }
private:
HB_DISALLOW_ASSIGN (hb_vector_t);
}; };
template <typename Type> template <typename Type>

3
src/hb-set-private.hh
View File

@ -675,6 +675,9 @@ struct hb_set_t
inline const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; } inline const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
inline unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; } inline unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
inline hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; } inline hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
private:
HB_DISALLOW_COPY_AND_ASSIGN (hb_set_t);
}; };