More TGuid helpers

1 files changed, 23 insertions, 22 deletions

diff --git a/library/cpp/yt/misc/guid-inl.h b/library/cpp/yt/misc/guid-inl.h
index 1c71d794bd..0e79a3aaa8 100644
--- a/library/cpp/yt/misc/guid-inl.h
+++ b/library/cpp/yt/misc/guid-inl.h
@@ -32,42 +32,43 @@ Y_FORCE_INLINE TGuid::operator bool() const
 
 ////////////////////////////////////////////////////////////////////////////////
 
-Y_FORCE_INLINE bool LessImpl(TGuid lhs, TGuid rhs) noexcept
+Y_FORCE_INLINE bool operator == (TGuid lhs, TGuid rhs) noexcept
+{
+    return
+        lhs.Parts64[0] == rhs.Parts64[0] &&
+        lhs.Parts64[1] == rhs.Parts64[1];
+}
+
+Y_FORCE_INLINE std::strong_ordering operator <=> (TGuid lhs, TGuid rhs) noexcept
 {
 #ifdef __GNUC__
     ui64 lhs0 = __builtin_bswap64(lhs.Parts64[0]);
     ui64 rhs0 = __builtin_bswap64(rhs.Parts64[0]);
     if (lhs0 < rhs0) {
-        return true;
+        return std::strong_ordering::less;
     }
     if (lhs0 > rhs0) {
-        return false;
+        return std::strong_ordering::greater;
     }
     ui64 lhs1 = __builtin_bswap64(lhs.Parts64[1]);
     ui64 rhs1 = __builtin_bswap64(rhs.Parts64[1]);
-    return lhs1 < rhs1;
+    if (lhs1 < rhs1) {
+        return std::strong_ordering::less;
+    }
+    if (lhs1 > rhs1) {
+        return std::strong_ordering::greater;
+    }
+    return std::strong_ordering::equal;
 #else
-    return memcmp(&lhs, &rhs, sizeof(TGuid)) < 0;
-#endif
-}
-
-Y_FORCE_INLINE bool operator == (const TGuid& lhs, const TGuid& rhs) noexcept
-{
-    return lhs.Parts64[0] == rhs.Parts64[0] &&
-           lhs.Parts64[1] == rhs.Parts64[1];
-}
-
-Y_FORCE_INLINE std::strong_ordering operator <=> (const TGuid& lhs, const TGuid& rhs) noexcept
-{
-    if (LessImpl(lhs, rhs)) {
+    int cmp = memcmp(&lhs, &rhs, sizeof(TGuid));
+    if (cmp < 0) {
         return std::strong_ordering::less;
     }
-
-    if (lhs == rhs) {
-        return std::strong_ordering::equal;
+    if (cmp > 0) {
+        return std::strong_ordering::greater;
     }
-
-    return std::strong_ordering::greater;
+    return std::strong_ordering::equal;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////