diff --git a/src/hb-meta.hh b/src/hb-meta.hh index 57defdee9..4a8a6420b 100644 --- a/src/hb-meta.hh +++ b/src/hb-meta.hh @@ -37,18 +37,18 @@ template static inline T hb_declval (); -template struct hb_match_const { typedef T type; enum { matched = false }; }; -template struct hb_match_const { typedef T type; enum { matched = true }; }; +template struct hb_match_const { typedef T type; enum { value = false }; }; +template struct hb_match_const { typedef T type; enum { value = true }; }; #define hb_remove_const(T) typename hb_match_const::type -#define hb_is_const(T) hb_match_const::matched -template struct hb_match_reference { typedef T type; enum { matched = false }; }; -template struct hb_match_reference { typedef T type; enum { matched = true }; }; +#define hb_is_const(T) hb_match_const::value +template struct hb_match_reference { typedef T type; enum { value = false }; }; +template struct hb_match_reference { typedef T type; enum { value = true }; }; #define hb_remove_reference(T) typename hb_match_reference::type -#define hb_is_reference(T) hb_match_reference::matched -template struct hb_match_pointer { typedef T type; enum { matched = false }; }; -template struct hb_match_pointer { typedef T type; enum { matched = true }; }; +#define hb_is_reference(T) hb_match_reference::value +template struct hb_match_pointer { typedef T type; enum { value = false }; }; +template struct hb_match_pointer { typedef T type; enum { value = true }; }; #define hb_remove_pointer(T) typename hb_match_pointer::type -#define hb_is_pointer(T) hb_match_pointer::matched +#define hb_is_pointer(T) hb_match_pointer::value /* Void! For when we need a expression-type of void. */