From 17c80035adc61c52a9e9600664496e3e4b837e37 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 9 Jun 2022 04:17:38 -0600
Subject: [PATCH] Revert "[cplusplus] Internally allow using hb_unique_ptr with
 hb_free()"

This reverts commit b5f621b08d56c15832ab4f588a0673fce03305a0.

A build was failing with clang 14 for Firefox apparently, sigh.

https://github.com/harfbuzz/harfbuzz/issues/3647
---
 src/hb.hh | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/hb.hh b/src/hb.hh
index b96a1b735..14872e2a4 100644
--- a/src/hb.hh
+++ b/src/hb.hh
@@ -466,23 +466,10 @@ static_assert ((sizeof (hb_mask_t) == 4), "");
 static_assert ((sizeof (hb_var_int_t) == 4), "");
 
 
-#include "hb-cplusplus.hh"
-
-namespace hb {
-
-// Allow using hb::unique_ptr with hb_free() internally.
-template <typename T>
-struct vtable
-{
-  static constexpr auto destroy = hb_free;
-};
-
-}
-
-
 /* Headers we include for everyone.  Keep topologically sorted by dependency.
  * They express dependency amongst themselves, but no other file should include
  * them directly.*/
+#include "hb-cplusplus.hh"
 #include "hb-meta.hh"
 #include "hb-mutex.hh"
 #include "hb-number.hh"