src/hb-map-private.hh | 2 +- src/hb-ot-shape-private.hh | 2 +- src/hb-private.hh | 6 +----- src/hb-set-private.hh | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-)
New commits: commit ff92de766bf775bfdd3a01bda94de699180ff86a Author: Behdad Esfahbod <[email protected]> Date: Tue May 29 18:48:45 2018 -0700 Remove HB_DISALLOW_COPY_AND_ASSIGN llvm-gcc-4.2 bot had this problem: hb-private.hh:812: error: initializer specified for non-virtual method 'void hb_vector_t<Type, StaticSize>::operator=(const hb_vector_t<Type, StaticSize>&) [with Type = hb_user_data_array_t::hb_user_data_item_t, unsigned int StaticSize = 1u]' Removing the delete didn't work with a constructor. So, remove constructor. Just disallow assignment. Still better than nothing. diff --git a/src/hb-map-private.hh b/src/hb-map-private.hh index 0baec082..ef2ee466 100644 --- a/src/hb-map-private.hh +++ b/src/hb-map-private.hh @@ -251,7 +251,7 @@ struct hb_map_t } private: - HB_DISALLOW_COPY_AND_ASSIGN (hb_map_t); + HB_DISALLOW_ASSIGN (hb_map_t); }; diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh index c217af0c..a540e6af 100644 --- a/src/hb-ot-shape-private.hh +++ b/src/hb-ot-shape-private.hh @@ -99,7 +99,7 @@ struct hb_ot_shape_planner_t } private: - HB_DISALLOW_COPY_AND_ASSIGN (hb_ot_shape_planner_t); + HB_DISALLOW_ASSIGN (hb_ot_shape_planner_t); }; diff --git a/src/hb-private.hh b/src/hb-private.hh index 98595035..4a8f795e 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -537,11 +537,7 @@ _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 + void operator=(const TypeName&) /* * Static pools diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh index 07f8a571..84a76e69 100644 --- a/src/hb-set-private.hh +++ b/src/hb-set-private.hh @@ -677,7 +677,7 @@ struct hb_set_t 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); + HB_DISALLOW_ASSIGN (hb_set_t); }; _______________________________________________ HarfBuzz mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/harfbuzz
