1 files changed, 6 insertions, 5 deletions

diff --git a/src/common/uuid.h b/src/common/uuid.h
index b8864b34f..f6ad064fb 100644
--- a/src/common/uuid.h
+++ b/src/common/uuid.h
@@ -19,15 +19,16 @@ struct UUID {
     constexpr explicit UUID(const u128& id) : uuid{id} {}
     constexpr explicit UUID(const u64 lo, const u64 hi) : uuid{{lo, hi}} {}
 
-    explicit operator bool() const {
-        return uuid != INVALID_UUID;
+    constexpr explicit operator bool() const {
+        return uuid[0] != INVALID_UUID[0] && uuid[1] != INVALID_UUID[1];
     }
 
-    bool operator==(const UUID& rhs) const {
-        return uuid == rhs.uuid;
+    constexpr bool operator==(const UUID& rhs) const {
+        // TODO(DarkLordZach): Replace with uuid == rhs.uuid with C++20
+        return uuid[0] == rhs.uuid[0] && uuid[1] == rhs.uuid[1];
     }
 
-    bool operator!=(const UUID& rhs) const {
+    constexpr bool operator!=(const UUID& rhs) const {
         return !operator==(rhs);
     }