diff --git a/src/hb-map.hh b/src/hb-map.hh index f91da642d..cc423c3ef 100644 --- a/src/hb-map.hh +++ b/src/hb-map.hh @@ -94,7 +94,7 @@ struct hb_hashmap_t bool operator == (const K &o) { return hb_deref (key) == hb_deref (o); } bool operator == (const item_t &o) { return *this == o.key; } hb_pair_t get_pair() const { return hb_pair_t (key, value); } - hb_pair_t get_pair_ref() const { return hb_pair_t (key, value); } + hb_pair_t get_pair_ref() const { return hb_pair_t (key, value); } uint32_t total_hash () const { return (hash * 31) + hb_hash (value); } @@ -286,7 +286,7 @@ struct hb_hashmap_t ( + hb_array (items, mask ? mask + 1 : 0) | hb_filter (&item_t::is_real) - | hb_map (&item_t::get_pair) + | hb_map (&item_t::get_pair_ref) ) auto keys () const HB_AUTO_RETURN ( diff --git a/src/test-map.cc b/src/test-map.cc index 9eef49e88..4cb248bd4 100644 --- a/src/test-map.cc +++ b/src/test-map.cc @@ -194,6 +194,7 @@ main (int argc, char **argv) m.get (hb::shared_ptr ()); m.get (hb::shared_ptr (hb_set_get_empty ())); + m.iter (); } /* Test hb::unique_ptr. */ hb_hash (hb::unique_ptr ()); @@ -202,6 +203,7 @@ main (int argc, char **argv) m.get (hb::unique_ptr ()); m.get (hb::unique_ptr (hb_set_get_empty ())); + m.iter_ref (); } return 0;