src/hb-ot-cmap-table.hh | 16 ++-------------- src/hb.hh | 13 ++++++++++++- 2 files changed, 14 insertions(+), 15 deletions(-)
New commits: commit c7c5df9ffd4f7bcc84a9a02a565ccc1807cca529 Author: Behdad Esfahbod <[email protected]> Date: Mon Oct 29 15:16:52 2018 -0700 Try fixing older bots Older C++ doesn't allow struct-with-constructor in union. diff --git a/src/hb.hh b/src/hb.hh index 18bccdbc..8198d396 100644 --- a/src/hb.hh +++ b/src/hb.hh @@ -337,6 +337,8 @@ static_assert ((sizeof (hb_mask_t) == 4), ""); static_assert ((sizeof (hb_var_int_t) == 4), ""); +#if __cplusplus >= 201103L + #define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName&); \ void operator=(const TypeName&) @@ -344,8 +346,17 @@ static_assert ((sizeof (hb_var_int_t) == 4), ""); TypeName(const TypeName<T>&); \ void operator=(const TypeName<T>&) #define HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2(TypeName, T1, T2) \ + inline TypeName() {} \ TypeName(const TypeName<T1, T2>&); \ - void operator=(const TypeName<T1, T2>&) + void operator=(const TypeName<T1, T2>&); + +#else /* __cpluspplus >= 201103L */ + +#define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) +#define HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE(TypeName, T) +#define HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2(TypeName, T1, T2) + +#endif /* __cpluspplus >= 201103L */ /* commit be87959a67b8ccf2b21d3cfdb7d16202f18df670 Author: Behdad Esfahbod <[email protected]> Date: Mon Oct 29 15:16:38 2018 -0700 [cmap] Minor diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index d5b4fde3..f0dbef69 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -851,18 +851,6 @@ struct cmap struct subset_plan { - subset_plan(void) - { - format4_segments.init(); - format12_groups.init(); - } - - ~subset_plan(void) - { - format4_segments.fini(); - format12_groups.fini(); - } - inline size_t final_size() const { return 4 // header @@ -872,9 +860,9 @@ struct cmap } // Format 4 - hb_vector_t<CmapSubtableFormat4::segment_plan> format4_segments; + hb_auto_t<hb_vector_t<CmapSubtableFormat4::segment_plan> > format4_segments; // Format 12 - hb_vector_t<CmapSubtableLongGroup> format12_groups; + hb_auto_t<hb_vector_t<CmapSubtableLongGroup> > format12_groups; }; inline bool sanitize (hb_sanitize_context_t *c) const _______________________________________________ HarfBuzz mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/harfbuzz
