From de411007bceda17457fb27ea72b4433adf744797 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Thu, 23 Dec 2021 13:21:21 +0100 Subject: Removed emplace functions if not i_valraw or i_keyraw is defined. Safety/optimize measure. --- examples/birthday.c | 4 ++-- examples/box2.c | 4 ++-- examples/csmap_find.c | 14 +++++++------- examples/demos.c | 4 ++-- examples/ex_gauss1.c | 2 +- examples/new_sptr.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'examples') diff --git a/examples/birthday.c b/examples/birthday.c index f9b777c0..f848436c 100644 --- a/examples/birthday.c +++ b/examples/birthday.c @@ -23,7 +23,7 @@ static void test_repeats(void) cmap_ic_reserve(&m, N); c_forrange (i, N) { uint64_t k = stc64_rand(&rng) & mask; - int v = cmap_ic_emplace(&m, k, 0).ref->second += 1; + int v = cmap_ic_insert(&m, k, 0).ref->second += 1; if (v > 1) printf("repeated value %zu (%d) at 2^%d\n", k, v, (int) log2((double) i)); } } @@ -44,7 +44,7 @@ void test_distribution(void) c_auto (cmap_x, map) { c_forrange (N) { uint64_t k = stc64_rand(&rng); - cmap_x_emplace(&map, k & 0xf, 0).ref->second += 1; + cmap_x_insert(&map, k & 0xf, 0).ref->second += 1; } uint64_t sum = 0; diff --git a/examples/box2.c b/examples/box2.c index d79ea32d..fd76f8eb 100644 --- a/examples/box2.c +++ b/examples/box2.c @@ -38,7 +38,7 @@ Point origin(void) { cbox_Point boxed_origin(void) { // Allocate this point on the heap, and return a pointer to it - return cbox_Point_new((Point){ .x=0.0, .y=0.0 }); + return cbox_Point_from((Point){ .x=0.0, .y=0.0 }); } @@ -56,7 +56,7 @@ int main(void) { c_auto (cbox_Point, boxed_point) c_auto (cbox_BoxPoint, box_in_a_box) { - boxed_rectangle = cbox_Rectangle_new((Rectangle){ + boxed_rectangle = cbox_Rectangle_from((Rectangle){ .top_left = origin(), .bottom_right = (Point){ .x=3.0, .y=-4.0 } }); diff --git a/examples/csmap_find.c b/examples/csmap_find.c index 078c7a11..ea86d71b 100644 --- a/examples/csmap_find.c +++ b/examples/csmap_find.c @@ -51,18 +51,18 @@ int main() print_collection_csmap_istr(m1); typedef cvec_istr_value pair; - cvec_istr_emplace_back(&v, (pair){43, "Tc"}); - cvec_istr_emplace_back(&v, (pair){41, "Nb"}); - cvec_istr_emplace_back(&v, (pair){46, "Pd"}); - cvec_istr_emplace_back(&v, (pair){42, "Mo"}); - cvec_istr_emplace_back(&v, (pair){44, "Ru"}); - cvec_istr_emplace_back(&v, (pair){44, "Ru"}); // attempt a duplicate + cvec_istr_push_back(&v, (pair){43, "Tc"}); + cvec_istr_push_back(&v, (pair){41, "Nb"}); + cvec_istr_push_back(&v, (pair){46, "Pd"}); + cvec_istr_push_back(&v, (pair){42, "Mo"}); + cvec_istr_push_back(&v, (pair){44, "Ru"}); + cvec_istr_push_back(&v, (pair){44, "Ru"}); // attempt a duplicate puts("Inserting the following vector data into m1:"); print_collection_cvec_istr(v); c_foreach (i, cvec_istr, cvec_istr_begin(&v), cvec_istr_end(&v)) - csmap_istr_emplace(&m1, i.ref->first, i.ref->second); + csmap_istr_emplace(&m1, c_pair(*i.ref)); puts("The modified map m1 is (key, value):"); print_collection_csmap_istr(m1); diff --git a/examples/demos.c b/examples/demos.c index 32e5dde0..93192ee5 100644 --- a/examples/demos.c +++ b/examples/demos.c @@ -130,8 +130,8 @@ void mapdemo1() { printf("\nMAPDEMO1\n"); cmap_ii nums = cmap_ii_init(); - cmap_ii_emplace(&nums, 8, 64); - cmap_ii_emplace(&nums, 11, 121); + cmap_ii_insert(&nums, 8, 64); + cmap_ii_insert(&nums, 11, 121); printf("val 8: %d\n", *cmap_ii_at(&nums, 8)); cmap_ii_drop(&nums); } diff --git a/examples/ex_gauss1.c b/examples/ex_gauss1.c index 6725393f..8a39732a 100644 --- a/examples/ex_gauss1.c +++ b/examples/ex_gauss1.c @@ -39,7 +39,7 @@ int main() { c_forrange (N) { int index = (int) round( stc64_normalf(&rng, &dist) ); - cmap_ii_emplace(&histmap, index, 0).ref->second += 1; + cmap_ii_insert(&histmap, index, 0).ref->second += 1; } // Transfer map to vec and sort it by map keys. diff --git a/examples/new_sptr.c b/examples/new_sptr.c index 045eef77..23fe5791 100644 --- a/examples/new_sptr.c +++ b/examples/new_sptr.c @@ -37,8 +37,8 @@ int main(void) { cstack_iptr_push(&stk, carc_int_from(10)); cstack_iptr_push(&stk, carc_int_from(20)); cstack_iptr_push(&stk, carc_int_from(30)); - cstack_iptr_emplace(&stk, *cstack_iptr_top(&stk)); - cstack_iptr_emplace(&stk, *cstack_iptr_begin(&stk).ref); + cstack_iptr_push(&stk, *cstack_iptr_top(&stk)); + cstack_iptr_push(&stk, *cstack_iptr_begin(&stk).ref); c_foreach (i, cstack_iptr, stk) printf(" %d", *i.ref->get); -- cgit v1.2.3