src/hb-open-type.hh | 10 +++++-----
src/hb-ot-shape.hh | 3 ---
src/hb.hh | 15 +++++++++------
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ea0e51d1b161245aaf5ad0f844bb5316b1cbcd5e
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Mon Oct 29 16:00:23 2018 -0700
Add HB_NO_CREATE_COPY_ASSIGN
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index ee452864..e9f99b10 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -335,7 +335,7 @@ static inline Type& operator + (Base &base, OffsetTo<Type,
OffsetType, has_null>
template <typename Type>
struct UnsizedArrayOf
{
- HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE (UnsizedArrayOf, Type);
+ HB_NO_CREATE_COPY_ASSIGN_TEMPLATE (UnsizedArrayOf, Type);
inline const Type& operator [] (unsigned int i) const { return arrayZ[i]; }
inline Type& operator [] (unsigned int i) { return arrayZ[i]; }
@@ -426,7 +426,7 @@ struct UnsizedOffsetListOf : UnsizedOffsetArrayOf<Type,
OffsetType, has_null>
template <typename Type, typename LenType=HBUINT16>
struct ArrayOf
{
- HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2 (ArrayOf, Type, LenType);
+ HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOf, Type, LenType);
inline const Type *sub_array (unsigned int start_offset, unsigned int
*pcount /* IN/OUT */) const
{
@@ -593,7 +593,7 @@ struct OffsetListOf : OffsetArrayOf<Type>
template <typename Type, typename LenType=HBUINT16>
struct HeadlessArrayOf
{
- HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2 (HeadlessArrayOf, Type, LenType);
+ HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (HeadlessArrayOf, Type, LenType);
inline const Type& operator [] (unsigned int i) const
{
@@ -659,7 +659,7 @@ struct HeadlessArrayOf
template <typename Type, typename LenType=HBUINT16>
struct ArrayOfM1
{
- HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2 (ArrayOfM1, Type, LenType);
+ HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOfM1, Type, LenType);
inline const Type& operator [] (unsigned int i) const
{
@@ -791,7 +791,7 @@ struct VarSizedBinSearchHeader
template <typename Type>
struct VarSizedBinSearchArrayOf
{
- HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE (VarSizedBinSearchArrayOf, Type);
+ HB_NO_CREATE_COPY_ASSIGN_TEMPLATE (VarSizedBinSearchArrayOf, Type);
inline const Type& operator [] (unsigned int i) const
{
diff --git a/src/hb.hh b/src/hb.hh
index d29baabf..74dd8ace 100644
--- a/src/hb.hh
+++ b/src/hb.hh
@@ -339,21 +339,24 @@ static_assert ((sizeof (hb_var_int_t) == 4), "");
#if __cplusplus >= 201103L
-#define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) \
+#define HB_NO_CREATE_COPY_ASSIGN(TypeName) \
+ TypeName(void); \
TypeName(const TypeName&); \
void operator=(const TypeName&)
-#define HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE(TypeName, T) \
+#define HB_NO_CREATE_COPY_ASSIGN_TEMPLATE(TypeName, T) \
+ TypeName(void); \
TypeName(const TypeName<T>&); \
void operator=(const TypeName<T>&)
-#define HB_DISALLOW_COPY_AND_ASSIGN_TEMPLATE2(TypeName, T1, T2) \
+#define HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2(TypeName, T1, T2) \
+ TypeName(void); \
TypeName(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)
+#define HB_NO_CREATE_COPY_ASSIGN(TypeName)
+#define HB_NO_CREATE_COPY_ASSIGN_TEMPLATE(TypeName, T)
+#define HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2(TypeName, T1, T2)
#endif /* __cpluspplus >= 201103L */
commit 5b563640b2df5b100130c9901b666713b2e1767e
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Mon Oct 29 15:58:44 2018 -0700
Remove HB_DISALLOW_COPY_AND_ASSIGN from hb_ot_shape_planner_t
It was arbitrary that this struct had it and not dozens of others.
diff --git a/src/hb-ot-shape.hh b/src/hb-ot-shape.hh
index e7d6204a..1cb9e24d 100644
--- a/src/hb-ot-shape.hh
+++ b/src/hb-ot-shape.hh
@@ -102,9 +102,6 @@ struct hb_ot_shape_planner_t
HB_INTERNAL void compile (hb_ot_shape_plan_t &plan,
const int *coords,
unsigned int num_coords);
-
- private:
- HB_DISALLOW_COPY_AND_ASSIGN (hb_ot_shape_planner_t);
};
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/harfbuzz
