From ba4699ffcaba30101757016abfd760bb707e5d9f Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 9 Apr 2021 17:02:26 +0300 Subject: [PATCH] repair: Convert repair_sync_boundary::tri_compare to strong_ordering The change partially reverts 37855641 Signed-off-by: Pavel Emelyanov --- repair/repair.hh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/repair/repair.hh b/repair/repair.hh index a02b3d30cd..73ddab0d3b 100644 --- a/repair/repair.hh +++ b/repair/repair.hh @@ -356,14 +356,10 @@ struct repair_sync_boundary { position_in_partition::tri_compare _position_cmp; public: tri_compare(const schema& s) : _pk_cmp(s), _position_cmp(s) { } - int operator()(const repair_sync_boundary& a, const repair_sync_boundary& b) const { - auto tmp = _pk_cmp(a.pk, b.pk); - auto ret = 0; - if (tmp != 0) { - ret = tmp < 0 ? -1 : 1; - } + std::strong_ordering operator()(const repair_sync_boundary& a, const repair_sync_boundary& b) const { + auto ret = _pk_cmp(a.pk, b.pk); if (ret == 0) { - ret = _position_cmp(a.position, b.position); + ret = _position_cmp(a.position, b.position) <=> 0; } return ret; }