From e387f12f34777bbcdce211024ef871c3e9243989 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Wed, 29 Oct 2025 16:01:47 -0400 Subject: pkbktarr: cpp dtor no-op, call teardown manually --- pk.h.in | 2 +- pkbktarr.h | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pk.h.in b/pk.h.in index fcbbe32..3a0a404 100644 --- a/pk.h.in +++ b/pk.h.in @@ -268,7 +268,7 @@ * struct pk_bkt_arr_handle h = pk_bkt_arr_new_handle(&arr); * arr[h] = 128; * pk_bkt_arr_free_handle(&arr, h); -* arr.~pk_bkt_arr(); // manually call dtor for globals +* pk_bkt_arr_teardown(&arr); * ``` * ******************************************************************************** diff --git a/pkbktarr.h b/pkbktarr.h index a437e79..fc6e90a 100644 --- a/pkbktarr.h +++ b/pkbktarr.h @@ -73,24 +73,18 @@ bool pk_bkt_arr_iter_decrement(struct pk_bkt_arr *arr, struct pk_iter *it); #include template struct pk_bkt_arr_t : public pk_bkt_arr { - pk_bkt_arr_t(); + pk_bkt_arr_t() = default; pk_bkt_arr_t(struct pk_bkt_arr_handle limits, struct pk_membucket *bkt_buckets, struct pk_membucket *bkt_data); - ~pk_bkt_arr_t(); + ~pk_bkt_arr_t() = default; T &operator[](struct pk_bkt_arr_handle); using FN_Iter = pk_tmpln_1; using FN_Find = pk_tmpln_2; }; template -pk_bkt_arr_t::pk_bkt_arr_t() { } -template pk_bkt_arr_t::pk_bkt_arr_t(struct pk_bkt_arr_handle limits, struct pk_membucket *bkt_buckets, struct pk_membucket *bkt_data) { pk_bkt_arr_init(this, sizeof(T), alignof(T), limits, bkt_buckets, bkt_data); } template -pk_bkt_arr_t::~pk_bkt_arr_t() { - pk_bkt_arr_teardown(this); -} -template T &pk_bkt_arr_t::operator[](struct pk_bkt_arr_handle handle) { assert(this->idx_unused != nullptr); assert(this->bucketed_data != nullptr); -- cgit v1.2.3