walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename hb_deref_pointer() to hb_deref()

This commit is contained in:
Behdad Esfahbod 2019-05-06 23:17:39 -07:00
parent 0b1ca5a13b
commit 240f57e58d
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-algs.hh
View File

@ -50,7 +50,7 @@ struct
{ {
private: private:
template <typename T> auto template <typename T> auto
impl (const T& v, hb_priority<1>) const HB_RETURN (uint32_t, hb_deref_pointer (v).hash ()) impl (const T& v, hb_priority<1>) const HB_RETURN (uint32_t, hb_deref (v).hash ())
template <typename T, template <typename T,
hb_enable_if (hb_is_integer (T))> auto hb_enable_if (hb_is_integer (T))> auto
@ -73,17 +73,17 @@ struct
/* Pointer-to-member-function. */ /* Pointer-to-member-function. */
template <typename Appl, typename Val1, typename ...Vals> auto template <typename Appl, typename Val1, typename ...Vals> auto
impl (Appl&& a, hb_priority<2>, Val1 &&v1, Vals &&...vs) const HB_AUTO_RETURN impl (Appl&& a, hb_priority<2>, Val1 &&v1, Vals &&...vs) const HB_AUTO_RETURN
((hb_deref_pointer (hb_forward<Val1> (v1)).*hb_forward<Appl> (a)) (hb_forward<Vals> (vs)...)) ((hb_deref (hb_forward<Val1> (v1)).*hb_forward<Appl> (a)) (hb_forward<Vals> (vs)...))
/* Pointer-to-member. */ /* Pointer-to-member. */
template <typename Appl, typename Val> auto template <typename Appl, typename Val> auto
impl (Appl&& a, hb_priority<1>, Val &&v) const HB_AUTO_RETURN impl (Appl&& a, hb_priority<1>, Val &&v) const HB_AUTO_RETURN
((hb_deref_pointer (hb_forward<Val> (v))).*hb_forward<Appl> (a)) ((hb_deref (hb_forward<Val> (v))).*hb_forward<Appl> (a))
/* Operator(). */ /* Operator(). */
template <typename Appl, typename ...Vals> auto template <typename Appl, typename ...Vals> auto
impl (Appl&& a, hb_priority<0>, Vals &&...vs) const HB_AUTO_RETURN impl (Appl&& a, hb_priority<0>, Vals &&...vs) const HB_AUTO_RETURN
(hb_deref_pointer (hb_forward<Appl> (a)) (hb_forward<Vals> (vs)...)) (hb_deref (hb_forward<Appl> (a)) (hb_forward<Vals> (vs)...))
public: public:
@ -102,7 +102,7 @@ struct
template <typename Pred, typename Val> auto template <typename Pred, typename Val> auto
impl (Pred&& p, Val &&v, hb_priority<1>) const HB_AUTO_RETURN impl (Pred&& p, Val &&v, hb_priority<1>) const HB_AUTO_RETURN
(hb_deref_pointer (hb_forward<Pred> (p)).has (v)) (hb_deref (hb_forward<Pred> (p)).has (v))
template <typename Pred, typename Val> auto template <typename Pred, typename Val> auto
impl (Pred&& p, Val &&v, hb_priority<0>) const HB_AUTO_RETURN impl (Pred&& p, Val &&v, hb_priority<0>) const HB_AUTO_RETURN
@ -127,7 +127,7 @@ struct
template <typename Proj, typename Val> auto template <typename Proj, typename Val> auto
impl (Proj&& f, Val &&v, hb_priority<1>) const HB_AUTO_RETURN impl (Proj&& f, Val &&v, hb_priority<1>) const HB_AUTO_RETURN
(hb_deref_pointer (hb_forward<Proj> (f)).get (hb_forward<Val> (v))) (hb_deref (hb_forward<Proj> (f)).get (hb_forward<Val> (v)))
template <typename Proj, typename Val> auto template <typename Proj, typename Val> auto
impl (Proj&& f, Val &&v, hb_priority<0>) const HB_AUTO_RETURN impl (Proj&& f, Val &&v, hb_priority<0>) const HB_AUTO_RETURN

2
src/hb-map.hh
View File

@ -57,7 +57,7 @@ struct hb_hashmap_t
void clear () { key = kINVALID; value = vINVALID; } void clear () { key = kINVALID; value = vINVALID; }
bool operator == (K o) { return hb_deref_pointer (key) == hb_deref_pointer (o); } bool operator == (K o) { return hb_deref (key) == hb_deref (o); }
bool operator == (const item_t &o) { return *this == o.key; } bool operator == (const item_t &o) { return *this == o.key; }
bool is_unused () const { return key == kINVALID; } bool is_unused () const { return key == kINVALID; }
bool is_tombstone () const { return key != kINVALID && value == vINVALID; } bool is_tombstone () const { return key != kINVALID && value == vINVALID; }

2
src/hb-meta.hh
View File

@ -126,7 +126,7 @@ struct
template <typename T> auto template <typename T> auto
operator () (T *v) const HB_AUTO_RETURN (*v) operator () (T *v) const HB_AUTO_RETURN (*v)
} HB_FUNCOBJ (hb_deref_pointer); } HB_FUNCOBJ (hb_deref);
template<bool B, typename T = void> struct hb_enable_if {}; template<bool B, typename T = void> struct hb_enable_if {};

2
src/hb-serialize.hh
View File

@ -132,7 +132,7 @@ struct hb_serialize_context_t
{ return check_equal (v1 = v2, v2); } { return check_equal (v1 = v2, v2); }
template <typename T> bool propagate_error (T &&obj) template <typename T> bool propagate_error (T &&obj)
{ return check_success (!hb_deref_pointer (obj).in_error ()); } { return check_success (!hb_deref (obj).in_error ()); }
template <typename T1, typename... Ts> bool propagate_error (T1 &&o1, Ts &&...os) template <typename T1, typename... Ts> bool propagate_error (T1 &&o1, Ts &&...os)
{ return propagate_error (hb_forward<T1> (o1)) && { return propagate_error (hb_forward<T1> (o1)) &&