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

Factorization of _sort_union

Browse Source
This commit is contained in:
Patrick Pelissier committed 2020-07-19 00:59:11 +02:00
1 parent d5dc5d083d
commit 4488853642
1 file changed
+5 -6
Download Patch File Download Diff File Expand all files Collapse all files
m-algo.h
+5 -6
View File
@@ -458,15 +458,14 @@
type_t const *objDst = M_CALL_IT_CREF(cont_oplist, itDst); \ type_t const *objDst = M_CALL_IT_CREF(cont_oplist, itDst); \
/* Compare the current element of src and dst */ \ /* Compare the current element of src and dst */ \
int cmp = cmp_func(name, sort_name, objDst, objSrc); \ int cmp = cmp_func(name, sort_name, objDst, objSrc); \
if (cmp == 0) { \ if (cmp <= 0) { \
/* Skip same arguments in both lists */ \
M_CALL_IT_SET(cont_oplist, itIns, itDst); \
M_CALL_IT_NEXT(cont_oplist, itSrc); \
M_CALL_IT_NEXT(cont_oplist, itDst); \
} else if (cmp < 0) { \
/* The element of dst is before. Go to next element of dst */ \ /* The element of dst is before. Go to next element of dst */ \
M_CALL_IT_SET(cont_oplist, itIns, itDst); \ M_CALL_IT_SET(cont_oplist, itIns, itDst); \
M_CALL_IT_NEXT(cont_oplist, itDst); \ M_CALL_IT_NEXT(cont_oplist, itDst); \
if (cmp == 0) { \
/* Skip same arguments in both lists */ \
M_CALL_IT_NEXT(cont_oplist, itSrc); \
} \
} else { \ } else { \
/* The element of src is before. */ \ /* The element of src is before. */ \
/* insert objSrc before */ \ /* insert objSrc before */ \