From 3b2e604237d5c818dc9b24158e18bc556c566dce Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 13 Jan 2022 15:32:46 -0700
Subject: [PATCH] [meta] Use std::is_const instead of hb_is_const

---
 src/hb-meta.hh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hb-meta.hh b/src/hb-meta.hh
index 67f9f429f..c40b2a917 100644
--- a/src/hb-meta.hh
+++ b/src/hb-meta.hh
@@ -108,7 +108,6 @@ template <typename T> struct hb_match_const		: hb_type_identity_t<T>, hb_false_t
 template <typename T> struct hb_match_const<const T>	: hb_type_identity_t<T>, hb_true_type	{};
 template <typename T> using hb_remove_const = typename hb_match_const<T>::type;
 template <typename T> using hb_add_const = const T;
-#define hb_is_const(T) hb_match_const<T>::value
 
 template <typename T> struct hb_match_reference		: hb_type_identity_t<T>, hb_false_type	{};
 template <typename T> struct hb_match_reference<T &>	: hb_type_identity_t<T>, hb_true_type	{};
@@ -137,8 +136,8 @@ template <typename T> using hb_decay = hb_remove_const<hb_remove_reference<T>>;
 template <typename From, typename To>
 using hb_is_cr_convertible = hb_bool_constant<
   hb_is_same (hb_decay<From>, hb_decay<To>) &&
-  (!hb_is_const (From) || hb_is_const (To)) &&
-  (!std::is_reference<To>::value || hb_is_const (To) || std::is_reference<To>::value)
+  (!std::is_const<From>::value || std::is_const<To>::value) &&
+  (!std::is_reference<To>::value || std::is_const<To>::value || std::is_reference<To>::value)
 >;
 #define hb_is_cr_convertible(From,To) hb_is_cr_convertible<From, To>::value