admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to M_CALL for R/B TREE.

Browse Source
This commit is contained in:
Patrick Pelissier committed 2018-09-10 21:34:18 +02:00
1 parent fd3453bb2a
commit 74c12e6ea2
2 files changed
+30 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-prioqueue.h
+5 -5
View File
@@ -152,8 +152,8 @@
static inline int \
M_C(name, _i_cmp)(const prioqueue_t p, size_t i, size_t j) \
{ \
return M_GET_CMP oplist (*M_C(name, _array_cget)(p->array, i), \
*M_C(name, _array_cget)(p->array, j)); \
return M_CALL_CMP(oplist, *M_C(name, _array_cget)(p->array, i), \
*M_C(name, _array_cget)(p->array, j)); \
} \
\
static inline bool \
@@ -282,7 +282,7 @@
size_t size = M_C(name, _array_size)(p->array); \
size_t i = 0; \
for(i = 0; i < size; i++) { \
if (M_GET_EQUAL oplist (*M_C(name, _array_cget)(p->array, i), x)) \
if (M_CALL_EQUAL(oplist, *M_C(name, _array_cget)(p->array, i), x)) \
break; \
} \
/* If x is not found, then stop */ \
@@ -311,12 +311,12 @@
M_C(name, _update_further)(prioqueue_t p, type xold, type xnew) \
{ \
/* This update assumes that the new position is further in the heap */ \
assert (M_GET_CMP oplist (xold, xnew) > 0); \
assert (M_CALL_CMP(oplist, xold, xnew) > 0); \
/* First pass: search for an item EQUAL to x */ \
size_t size = M_C(name, _array_size)(p->array); \
size_t i = 0; \
for(i = 0; i < size; i++) { \
if (M_GET_EQUAL oplist (*M_C(name, _array_cget)(p->array, i), xold)) \
if (M_CALL_EQUAL(oplist, *M_C(name, _array_cget)(p->array, i), xold)) \
break; \
} \
/* We shall have found the item */ \