Try fixing older bots
Older C++ doesn't allow struct-with-constructor in union.
This commit is contained in:
parent
be87959a67
commit
c7c5df9ffd
13
src/hb.hh
13
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 */
|
||||
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue