From ff92de766bf775bfdd3a01bda94de699180ff86a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 29 May 2018 18:48:45 -0700
Subject: [PATCH] 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.
---
 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(-)

diff --git a/src/hb-map-private.hh b/src/hb-map-private.hh
index 0baec0827..ef2ee4667 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 c217af0c0..a540e6afa 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 985950352..4a8f795e4 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 07f8a571f..84a76e69c 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);
 };