src/hb-map-private.hh | 3 --- src/hb-private.hh | 6 ------ src/hb-set-private.hh | 3 --- src/hb-subset-plan.hh | 3 ++- 4 files changed, 2 insertions(+), 13 deletions(-)
New commits: commit 58400a2ad8b18aeb1da40d6c327135cd62312316 Author: Behdad Esfahbod <beh...@behdad.org> Date: Sat Jun 2 20:30:09 2018 -0700 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. diff --git a/src/hb-map-private.hh b/src/hb-map-private.hh index 7f6b02c5..76c40877 100644 --- a/src/hb-map-private.hh +++ b/src/hb-map-private.hh @@ -198,9 +198,6 @@ struct hb_map_t } return tombstone == INVALID ? i : tombstone; } - - private: - HB_DISALLOW_COPY_AND_ASSIGN (hb_map_t); }; diff --git a/src/hb-private.hh b/src/hb-private.hh index cdb6c306..429bab00 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -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> diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh index 9afa3d90..50be93b8 100644 --- a/src/hb-set-private.hh +++ b/src/hb-set-private.hh @@ -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); }; diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh index d69c43a4..c9904af8 100644 --- a/src/hb-subset-plan.hh +++ b/src/hb-subset-plan.hh @@ -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 (); _______________________________________________ HarfBuzz mailing list HarfBuzz@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/harfbuzz