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

Revert "Remove HB_DISALLOW_COPY_AND_ASSIGN" 

This reverts commit ff92de766b.

Revert that and remove ASSERT_POD. Let's see which bots are
unhappy with this configuration...
This commit is contained in:
Behdad Esfahbod 2018-06-01 16:07:55 -07:00
parent 7b50bf52f2
commit a7dd90f519
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,6 @@ struct hb_map_t
}; };
hb_object_header_t header; hb_object_header_t header;
ASSERT_POD ();
bool successful; /* Allocations successful */ bool successful; /* Allocations successful */
unsigned int population; /* Not including tombstones. */ unsigned int population; /* Not including tombstones. */
unsigned int occupancy; /* Including tombstones. */ unsigned int occupancy; /* Including tombstones. */
@ -252,7 +251,7 @@ struct hb_map_t
} }
private: private:
HB_DISALLOW_ASSIGN (hb_map_t); HB_DISALLOW_COPY_AND_ASSIGN (hb_map_t);
}; };

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

@ -99,7 +99,7 @@ struct hb_ot_shape_planner_t
} }
private: private:
HB_DISALLOW_ASSIGN (hb_ot_shape_planner_t); HB_DISALLOW_COPY_AND_ASSIGN (hb_ot_shape_planner_t);
}; };

6
src/hb-private.hh
View File

@ -537,7 +537,11 @@ _hb_ceil_to_4 (unsigned int v)
*/ */
#define HB_DISALLOW_ASSIGN(TypeName) \ #define HB_DISALLOW_ASSIGN(TypeName) \
void operator=(const 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

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

@ -180,7 +180,6 @@ struct hb_set_t
static_assert (page_t::PAGE_BITS == sizeof (page_t) * 8, ""); static_assert (page_t::PAGE_BITS == sizeof (page_t) * 8, "");
hb_object_header_t header; hb_object_header_t header;
ASSERT_POD ();
bool successful; /* Allocations successful */ bool successful; /* Allocations successful */
mutable unsigned int population; mutable unsigned int population;
hb_vector_t<page_map_t, 8> page_map; hb_vector_t<page_map_t, 8> page_map;
@ -679,7 +678,7 @@ struct hb_set_t
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: private:
HB_DISALLOW_ASSIGN (hb_set_t); HB_DISALLOW_COPY_AND_ASSIGN (hb_set_t);
}; };