From be64cae16489406147848e4613d11de8303e1513 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 2 Mar 2023 09:50:38 -0700
Subject: [PATCH] [map] Another try at fixing old Mac builds

Maybe fixes https://github.com/harfbuzz/harfbuzz/issues/4138
---
 src/hb-map.cc   |  4 ++--
 src/hb-map.hh   | 12 ------------
 src/test-map.cc |  4 ++--
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/hb-map.cc b/src/hb-map.cc
index 0014570e8..5d67cd9a1 100644
--- a/src/hb-map.cc
+++ b/src/hb-map.cc
@@ -399,7 +399,7 @@ void
 hb_map_keys (const hb_map_t *map,
 	     hb_set_t *keys)
 {
-  map->keys (*keys);
+  hb_copy (map->keys() , *keys);
 }
 
 /**
@@ -415,5 +415,5 @@ void
 hb_map_values (const hb_map_t *map,
 	       hb_set_t *values)
 {
-  map->values (*values);
+  hb_copy (map->values() , *values);
 }
diff --git a/src/hb-map.hh b/src/hb-map.hh
index b718f1657..552b40665 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -317,18 +317,6 @@ struct hb_hashmap_t
     hb_copy (other, *this);
   }
 
-  template <typename Iterable>
-  void keys (Iterable &keys_) const
-  {
-    hb_copy (keys() , keys_);
-  }
-
-  template <typename Iterable>
-  void values (Iterable &values_) const
-  {
-    hb_copy (values() , values_);
-  }
-
   /*
    * Iterator
    */
diff --git a/src/test-map.cc b/src/test-map.cc
index a0a59cbcd..61cc8bfb3 100644
--- a/src/test-map.cc
+++ b/src/test-map.cc
@@ -344,8 +344,8 @@ main (int argc, char **argv)
     hb_set_t keys;
     hb_set_t values;
 
-    m.keys (keys);
-    m.values (values);
+    hb_copy (m.keys (), keys);
+    hb_copy (m.values (), values);
 
     assert (keys.is_equal (hb_set_t ({1, 2, 3, 4, 5, 6})));
     assert (values.is_equal (hb_set_t ({1, 1, 2, 3, 5, 8})));