From e76652eda0c8e2008fd500adfcf4210e261f0583 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Mon, 4 Jan 2021 14:45:34 +0100 Subject: Removed cmap_X_entry_t alias for cmap_X_value_t. --- examples/advanced.c | 2 +- examples/ex_gaussian.c | 4 ++-- stc/cmap.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/advanced.c b/examples/advanced.c index 3f706c5c..f5a31587 100644 --- a/examples/advanced.c +++ b/examples/advanced.c @@ -54,7 +54,7 @@ int main() VikingRaw lookup = {"Einar", "Norway"}; - cmap_vk_entry_t *e = cmap_vk_find(&vikings, lookup); + cmap_vk_value_t *e = cmap_vk_find(&vikings, lookup); e->second += 3; // add 3 hp points to Einar cmap_vk_emplace(&vikings, lookup, 0).first->second += 5; // add 5 more to Einar diff --git a/examples/ex_gaussian.c b/examples/ex_gaussian.c index bfc40363..b9228aa5 100644 --- a/examples/ex_gaussian.c +++ b/examples/ex_gaussian.c @@ -10,11 +10,11 @@ using_cmap(i, int, size_t); // Declare int vector with map entries that can be sorted by map keys. -static int compare(cmap_i_entry_t *a, cmap_i_entry_t *b) { +static int compare(cmap_i_value_t *a, cmap_i_value_t *b) { return c_default_compare(&a->first, &b->first); } // Vector: typetag 'e' for (map) entry -using_cvec(e, cmap_i_entry_t, compare); +using_cvec(e, cmap_i_value_t, compare); int main() { diff --git a/stc/cmap.h b/stc/cmap.h index ea766636..63764e49 100644 --- a/stc/cmap.h +++ b/stc/cmap.h @@ -163,7 +163,7 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t; typedef CSET_ONLY_##ctype( ctype##_##X##_key_t ) \ CMAP_ONLY_##ctype( struct {ctype##_##X##_key_t first; \ ctype##_##X##_mapped_t second;} ) \ - ctype##_##X##_value_t, ctype##_##X##_entry_t; \ + ctype##_##X##_value_t; \ \ STC_INLINE void \ ctype##_##X##_entry_del(ctype##_##X##_value_t* e) { \ -- cgit v1.2.3