[meta] Use std::conditional instead of hb_conditional()
diff --git a/src/hb-meta.hh b/src/hb-meta.hh
index 3808d91..4ec3702 100644
--- a/src/hb-meta.hh
+++ b/src/hb-meta.hh
@@ -132,15 +132,6 @@
/* TODO Add feature-parity to std::decay. */
template <typename T> using hb_decay = hb_remove_const<hb_remove_reference<T>>;
-
-template<bool B, class T, class F>
-struct _hb_conditional { typedef T type; };
-template<class T, class F>
-struct _hb_conditional<false, T, F> { typedef F type; };
-template<bool B, class T, class F>
-using hb_conditional = typename _hb_conditional<B, T, F>::type;
-
-
template <typename From, typename To>
struct hb_is_convertible
{
@@ -150,7 +141,7 @@
static constexpr bool either_void = from_void || to_void;
static constexpr bool both_void = from_void && to_void;
- static hb_true_type impl2 (hb_conditional<to_void, int, To>);
+ static hb_true_type impl2 (typename std::conditional<to_void, int, To>::type);
template <typename T>
static auto impl (hb_priority<1>) -> decltype (impl2 (hb_declval (T)));
@@ -159,7 +150,7 @@
public:
static constexpr bool value = both_void ||
(!either_void &&
- decltype (impl<hb_conditional<from_void, int, From>> (hb_prioritize))::value);
+ decltype (impl<typename std::conditional<from_void, int, From>::type> (hb_prioritize))::value);
};
#define hb_is_convertible(From,To) hb_is_convertible<From, To>::value
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index 1504584..7e52417 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -64,7 +64,7 @@
IntType& operator = (Type i) { v = i; return *this; }
/* For reason we define cast out operator for signed/unsigned, instead of Type, see:
* https://github.com/harfbuzz/harfbuzz/pull/2875/commits/09836013995cab2b9f07577a179ad7b024130467 */
- operator hb_conditional<std::is_signed<Type>::value, signed, unsigned> () const { return v; }
+ operator typename std::conditional<std::is_signed<Type>::value, signed, unsigned>::type () const { return v; }
bool operator == (const IntType &o) const { return (Type) v == (Type) o.v; }
bool operator != (const IntType &o) const { return !(*this == o); }
