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

Try fixing older bots 

Older C++ doesn't allow struct-with-constructor in union.
This commit is contained in:
Behdad Esfahbod 2018-10-29 15:16:52 -07:00
parent be87959a67
commit c7c5df9ffd
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hb.hh
View File

@ -337,6 +337,8 @@ static_assert ((sizeof (hb_mask_t) == 4), "");
static_assert ((sizeof (hb_var_int_t) == 4), ""); static_assert ((sizeof (hb_var_int_t) == 4), "");
#if __cplusplus >= 201103L
#define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) \ #define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \ TypeName(const TypeName&); \
void operator=(const TypeName&) void operator=(const TypeName&)
@ -344,8 +346,17 @@ static_assert ((sizeof (hb_var_int_t) == 4), "");
TypeName(const TypeName<T>&); \ TypeName(const TypeName<T>&); \
void operator=(const TypeName<T>&) void operator=(const TypeName<T>&)
#define HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2(TypeName, T1, T2) \ #define HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2(TypeName, T1, T2) \
inline TypeName() {} \
TypeName(const TypeName<T1, T2>&); \ 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 */
/* /*