From f8e456532ffaa9225894e77d5851c8d93a8fdad2 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 28 Aug 2025 14:02:26 -0400 Subject: pkiter: promote to first-class feature --- pkbktarr.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'pkbktarr.h') diff --git a/pkbktarr.h b/pkbktarr.h index d0d2439..a833f87 100644 --- a/pkbktarr.h +++ b/pkbktarr.h @@ -3,6 +3,7 @@ #include "./pkmem.h" /* deleteme */ #include "./pkmacros.h" /* deleteme */ +#include "pkiter.h" /*deleteme*/ #ifndef PK_BKT_ARR_ALL_UNUSED_VAL #define PK_BKT_ARR_ALL_UNUSED_VAL 0xFFFFFFFFFFFFFFFF @@ -62,14 +63,10 @@ void pk_bkt_arr_free_handle(struct pk_bkt_arr *bkt_arr, struct pk_bkt_arr_handle int pk_bkt_arr_handle_compare(struct pk_bkt_arr_handle lhs, struct pk_bkt_arr_handle rhs); struct pk_bkt_arr_handle pk_bkt_arr_handle_increment(struct pk_bkt_arr *arr, struct pk_bkt_arr_handle h); struct pk_bkt_arr_handle pk_bkt_arr_handle_decrement(struct pk_bkt_arr *arr, struct pk_bkt_arr_handle h); - -#ifdef PK_IMPL_ITER -#include "pkiter.h" /*deleteme*/ bool pk_bkt_arr_iter_begin(struct pk_bkt_arr *arr, struct pk_iter *it); bool pk_bkt_arr_iter_end(struct pk_bkt_arr *arr, struct pk_iter *it); bool pk_bkt_arr_iter_increment(struct pk_bkt_arr *arr, struct pk_iter *it); bool pk_bkt_arr_iter_decrement(struct pk_bkt_arr *arr, struct pk_iter *it); -#endif #if defined (__cplusplus) #include "pktmpln.h" /*deleteme*/ @@ -338,8 +335,6 @@ struct pk_bkt_arr_handle pk_bkt_arr_handle_decrement(struct pk_bkt_arr *arr, str return h; } -#ifdef PK_IMPL_ITER - bool pk_bkt_arr_iter_begin(struct pk_bkt_arr *arr, struct pk_iter *it) { it->data = nullptr; it->id.bkt.b = 0; @@ -408,6 +403,4 @@ bool pk_bkt_arr_iter_decrement(struct pk_bkt_arr *arr, struct pk_iter *it) { return true; } -#endif /* PK_IMPL_ITER */ - #endif /* PK_IMPL_BKTARR */ -- cgit v1.2.3