diff options
| author | Tyge Løvset <[email protected]> | 2023-02-24 11:26:53 +0100 |
|---|---|---|
| committer | Tyge Løvset <[email protected]> | 2023-02-24 11:26:53 +0100 |
| commit | 84e75e1b5039c3e04d9683ec7d8302f1a824b5cb (patch) | |
| tree | a3229848ed987974e00638fb844a6ff7aa3099c6 /include/stc/cvec.h | |
| parent | 35e872ec6c0c23b0843e81ff886fc7f5742670b1 (diff) | |
| download | STC-modified-84e75e1b5039c3e04d9683ec7d8302f1a824b5cb.tar.gz STC-modified-84e75e1b5039c3e04d9683ec7d8302f1a824b5cb.zip | |
Allow to have both i_no_cmp and i_eq defined.
Diffstat (limited to 'include/stc/cvec.h')
| -rw-r--r-- | include/stc/cvec.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/stc/cvec.h b/include/stc/cvec.h index 88153912..8d5a5c87 100644 --- a/include/stc/cvec.h +++ b/include/stc/cvec.h @@ -87,9 +87,11 @@ STC_API _cx_iter _cx_memb(_erase_range_p)(_cx_self* self, _cx_value* p1, STC_API _cx_iter _cx_memb(_insert_range)(_cx_self* self, _cx_value* pos, const _cx_value* p1, const _cx_value* p2); STC_API _cx_iter _cx_memb(_insert_uninit)(_cx_self* self, _cx_value* pos, const intptr_t n); -#if !defined i_no_cmp -STC_API int _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y); +#if !defined i_no_cmp || defined _i_has_eq STC_API _cx_iter _cx_memb(_find_in)(_cx_iter it1, _cx_iter it2, _cx_raw raw); +#endif +#ifndef i_no_cmp +STC_API int _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y); STC_API _cx_iter _cx_memb(_binary_search_in)(_cx_iter it1, _cx_iter it2, _cx_raw raw, _cx_iter* lower_bound); #endif STC_INLINE void _cx_memb(_value_drop)(_cx_value* val) { i_keydrop(val); } @@ -215,7 +217,7 @@ STC_INLINE _cx_iter _cx_memb(_advance)(_cx_iter it, size_t n) STC_INLINE intptr_t _cx_memb(_index)(const _cx_self* self, _cx_iter it) { return (it.ref - self->data); } -#if !defined i_no_cmp +#if !defined i_no_cmp || defined _i_has_eq STC_INLINE _cx_iter _cx_memb(_find)(const _cx_self* self, _cx_raw raw) { @@ -231,6 +233,9 @@ STC_INLINE _cx_value* _cx_memb(_get_mut)(const _cx_self* self, _cx_raw raw) { return (_cx_value*) _cx_memb(_get)(self, raw); } +#endif +#ifndef i_no_cmp + STC_INLINE _cx_iter _cx_memb(_binary_search)(const _cx_self* self, _cx_raw raw) { _cx_iter lower; @@ -383,7 +388,7 @@ _cx_memb(_emplace_range)(_cx_self* self, _cx_value* pos, } #endif // !i_no_emplace -#if !defined i_no_cmp +#if !defined i_no_cmp || defined _i_has_eq STC_DEF _cx_iter _cx_memb(_find_in)(_cx_iter i1, _cx_iter i2, _cx_raw raw) { const _cx_value* p2 = _it2_ptr(i1, i2); @@ -395,6 +400,8 @@ _cx_memb(_find_in)(_cx_iter i1, _cx_iter i2, _cx_raw raw) { i2.ref = NULL; return i2; } +#endif +#ifndef i_no_cmp STC_DEF _cx_iter _cx_memb(_binary_search_in)(_cx_iter i1, _cx_iter i2, const _cx_raw raw, |