From 7bd508a0c4ce426f474bfcc729cb39207dd1f7b4 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sun, 12 Aug 2018 17:19:55 -0700
Subject: [PATCH] [lazy] Rename free()

---
 src/hb-ft.cc                | 4 ++--
 src/hb-glib.cc              | 2 +-
 src/hb-icu.cc               | 2 +-
 src/hb-machinery-private.hh | 4 ++--
 src/hb-ot-font.cc           | 2 +-
 src/hb-shape.cc             | 6 +++---
 src/hb-ucdn.cc              | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index e716ec9..01341b6 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -454,7 +454,7 @@ static struct hb_ft_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ft
 static
 void free_static_ft_funcs (void)
 {
-  static_ft_funcs.free ();
+  static_ft_funcs.free_instance ();
 }
 #endif
 
@@ -714,7 +714,7 @@ static struct hb_ft_library_lazy_loader_t : hb_lazy_loader_t<hb_remove_ptr_t<FT_
 static
 void free_static_ft_library (void)
 {
-  static_ft_library.free ();
+  static_ft_library.free_instance ();
 }
 #endif
 
diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index af7a0fd..342891d 100644
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -394,7 +394,7 @@ static struct hb_glib_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
 static
 void free_static_glib_funcs (void)
 {
-  static_glib_funcs.free ();
+  static_glib_funcs.free_instance ();
 }
 #endif
 
diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 551069f..380a99c 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -383,7 +383,7 @@ static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_
 static
 void free_static_icu_funcs (void)
 {
-  static_icu_funcs.free ();
+  static_icu_funcs.free_instance ();
 }
 #endif
 
diff --git a/src/hb-machinery-private.hh b/src/hb-machinery-private.hh
index e60e3be..2a7ef7b 100644
--- a/src/hb-machinery-private.hh
+++ b/src/hb-machinery-private.hh
@@ -637,7 +637,7 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
   {
     do_destroy (instance.get ());
   }
-  inline void free (void)
+  inline void free_instance (void)
   {
   retry:
     Stored *p = instance.get ();
@@ -720,7 +720,7 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
   static inline void destroy (Stored *p)
   {
     p->fini ();
-    ::free (p);
+    free (p);
   }
 
   private:
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 0b14ff1..9da8fc7 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -264,7 +264,7 @@ static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ot
 static
 void free_static_ot_funcs (void)
 {
-  static_ot_funcs.free ();
+  static_ot_funcs.free_instance ();
 }
 #endif
 
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 22a2020..86aa59a 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -50,7 +50,7 @@
 static void free_static_shaper_list (void);
 
 static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *,
-							     hb_shaper_list_lazy_loader_t>
+							      hb_shaper_list_lazy_loader_t>
 {
   static inline const char ** create (void)
   {
@@ -72,7 +72,7 @@ static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *,
   }
   static inline void destroy (const char **l)
   {
-    ::free (l);
+    free (l);
   }
   static inline const char ** get_null (void)
   {
@@ -85,7 +85,7 @@ static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *,
 static
 void free_static_shaper_list (void)
 {
-  static_shaper_list.free ();
+  static_shaper_list.free_instance ();
 }
 #endif
 
diff --git a/src/hb-ucdn.cc b/src/hb-ucdn.cc
index 6b1bb80..7b26e51 100644
--- a/src/hb-ucdn.cc
+++ b/src/hb-ucdn.cc
@@ -267,7 +267,7 @@ static struct hb_ucdn_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
 static
 void free_static_ucdn_funcs (void)
 {
-  static_ucdn_funcs.free ();
+  static_ucdn_funcs.free_instance ();
 }
 #endif
 
-- 
2.7.4