Remove DISALLOW_* from vector, set, and map

Some of the build bots, still fail on this.  I suppose mine pass because
I enable C++11...

Anyway, remove these again.
This commit is contained in:
Behdad Esfahbod 2018-06-02 20:30:09 -07:00
parent f9abbf83b6
commit 58400a2ad8
4 changed files with 2 additions and 13 deletions

View File

@ -198,9 +198,6 @@ struct hb_map_t
}
return tombstone == INVALID ? i : tombstone;
}
private:
HB_DISALLOW_COPY_AND_ASSIGN (hb_map_t);
};

View File

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

View File

@ -677,9 +677,6 @@ struct hb_set_t
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 hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
private:
HB_DISALLOW_COPY_AND_ASSIGN (hb_set_t);
};

View File

@ -35,7 +35,8 @@
#include "hb-object-private.hh"
#include "hb-map-private.hh"
struct hb_subset_plan_t {
struct hb_subset_plan_t
{
hb_object_header_t header;
ASSERT_POD ();