From 97ea10a63a0be388bfb02ae203c468533304bda0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 2 Jun 2022 11:14:17 -0600 Subject: [PATCH] Remove old nullptr_t hacks Were used for hashmap before. --- src/hb-array.hh | 2 -- src/hb-map.hh | 2 -- src/hb-set.hh | 1 - 3 files changed, 5 deletions(-) diff --git a/src/hb-array.hh b/src/hb-array.hh index 1963698cf..5baeb6f7f 100644 --- a/src/hb-array.hh +++ b/src/hb-array.hh @@ -56,7 +56,6 @@ struct hb_array_t : hb_iter_with_fallback_t, Type&> hb_array_t& operator= (const hb_array_t&) = default; hb_array_t& operator= (hb_array_t&&) = default; - constexpr hb_array_t (std::nullptr_t) : hb_array_t () {} constexpr hb_array_t (Type *array_, unsigned int length_) : arrayZ (array_), length (length_) {} template constexpr hb_array_t (Type (&array_)[length_]) : hb_array_t (array_, length_) {} @@ -314,7 +313,6 @@ struct hb_sorted_array_t : hb_sorted_array_t& operator= (const hb_sorted_array_t&) = default; hb_sorted_array_t& operator= (hb_sorted_array_t&&) = default; - constexpr hb_sorted_array_t (std::nullptr_t) : hb_sorted_array_t () {} constexpr hb_sorted_array_t (Type *array_, unsigned int length_) : hb_array_t (array_, length_) {} template constexpr hb_sorted_array_t (Type (&array_)[length_]) : hb_array_t (array_) {} diff --git a/src/hb-map.hh b/src/hb-map.hh index 9b435c7d7..fb3d2d1c7 100644 --- a/src/hb-map.hh +++ b/src/hb-map.hh @@ -39,7 +39,6 @@ template ~hb_set_t () = default; hb_set_t () : sparseset () {}; - hb_set_t (std::nullptr_t) : hb_set_t () {}; hb_set_t (const hb_set_t &o) : sparseset ((sparseset &) o) {}; hb_set_t (hb_set_t&& o) : sparseset (std::move ((sparseset &) o)) {} hb_set_t& operator = (const hb_set_t&) = default;