Merge branch 'cc/test-oidmap'

diff --git a/oidset.c b/oidset.c
index fe4eb921df81bbabe1b95bd7f594235f360eec7d..8bdecb13de1e0d0f24bfccb27dd46cdf64b27cff 100644 (file)
--- a/oidset.c
+++ b/oidset.c
@@ -5,33 +5,33 @@ void oidset_init(struct oidset *set, size_t initial_size)
 {
        memset(&set->set, 0, sizeof(set->set));
        if (initial_size)
-               kh_resize_oid(&set->set, initial_size);
+               kh_resize_oid_set(&set->set, initial_size);
 }
 
 int oidset_contains(const struct oidset *set, const struct object_id *oid)
 {
-       khiter_t pos = kh_get_oid(&set->set, *oid);
+       khiter_t pos = kh_get_oid_set(&set->set, *oid);
        return pos != kh_end(&set->set);
 }
 
 int oidset_insert(struct oidset *set, const struct object_id *oid)
 {
        int added;
-       kh_put_oid(&set->set, *oid, &added);
+       kh_put_oid_set(&set->set, *oid, &added);
        return !added;
 }
 
 int oidset_remove(struct oidset *set, const struct object_id *oid)
 {
-       khiter_t pos = kh_get_oid(&set->set, *oid);
+       khiter_t pos = kh_get_oid_set(&set->set, *oid);
        if (pos == kh_end(&set->set))
                return 0;
-       kh_del_oid(&set->set, pos);
+       kh_del_oid_set(&set->set, pos);
        return 1;
 }
 
 void oidset_clear(struct oidset *set)
 {
-       kh_release_oid(&set->set);
+       kh_release_oid_set(&set->set);
        oidset_init(set, 0);
 }