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

[map] Massage some more 

Towards being able to store arbitrary types.
This commit is contained in:
Behdad Esfahbod 2022-01-13 11:48:34 -07:00
parent cfe2b66114
commit ca4f56bdc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-map.hh
View File

@ -41,8 +41,8 @@ template <typename K, typename V,
v_invalid_t vINVALID = hb_is_pointer (V) ? 0 : std::is_signed<V>::value ? hb_int_min (V) : (V) -1> v_invalid_t vINVALID = hb_is_pointer (V) ? 0 : std::is_signed<V>::value ? hb_int_min (V) : (V) -1>
struct hb_hashmap_t struct hb_hashmap_t
{ {
static constexpr K INVALID_KEY = kINVALID; static constexpr k_invalid_t INVALID_KEY = kINVALID;
static constexpr V INVALID_VALUE = vINVALID; static constexpr v_invalid_t INVALID_VALUE = vINVALID;
hb_hashmap_t () { init (); } hb_hashmap_t () { init (); }
~hb_hashmap_t () { fini (); } ~hb_hashmap_t () { fini (); }
@ -200,14 +200,14 @@ struct hb_hashmap_t
void del (K key) { set (key, vINVALID); } void del (K key) { set (key, vINVALID); }
/* Has interface. */ /* Has interface. */
static constexpr V SENTINEL = vINVALID;
typedef V value_t; typedef V value_t;
value_t operator [] (K k) const { return get (k); } value_t operator [] (K k) const { return get (k); }
bool has (K k, V *vp = nullptr) const bool has (K k, V *vp = nullptr) const
{ {
V v = (*this)[k]; V v = (*this)[k];
if (vp) *vp = v; if (vp) *vp = v;
return v != SENTINEL; const V vinv = vINVALID;
return v != vinv;
} }
/* Projection. */ /* Projection. */
V operator () (K k) const { return get (k); } V operator () (K k) const { return get (k); }