diff options
| -rw-r--r-- | src/hb-ft.cc | 4 | ||||
| -rw-r--r-- | src/hb-glib.cc | 2 | ||||
| -rw-r--r-- | src/hb-icu.cc | 2 | ||||
| -rw-r--r-- | src/hb-machinery-private.hh | 4 | ||||
| -rw-r--r-- | src/hb-ot-font.cc | 2 | ||||
| -rw-r--r-- | src/hb-shape.cc | 6 | ||||
| -rw-r--r-- | 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 e716ec91..01341b60 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 af7a0fd3..342891d9 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 551069fa..380a99c8 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 e60e3bec..2a7ef7ba 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 0b14ff1e..9da8fc7d 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 22a2020b..86aa59ab 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 6b1bb804..7b26e512 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 |