update ceph source to reef 18.1.2

[ceph.git] / ceph / src / common / entity_name.h

diff --git a/ceph/src/common/entity_name.h b/ceph/src/common/entity_name.h
index 5e5ab111404a68f9a72c91b3794990aeb7f89b54..c88ebcbbabde05ad83520a047627caf4d7decc9f 100644 (file)
--- a/ceph/src/common/entity_name.h
+++ b/ceph/src/common/entity_name.h
@@ -70,8 +70,10 @@ struct EntityName
 
   friend bool operator<(const EntityName& a, const EntityName& b);
   friend std::ostream& operator<<(std::ostream& out, const EntityName& n);
-  friend bool operator==(const EntityName& a, const EntityName& b);
-  friend bool operator!=(const EntityName& a, const EntityName& b);
+
+  bool operator==(const EntityName& rhs) const noexcept {
+    return type == rhs.type && id == rhs.id;
+  }
 
 private:
   struct str_to_entity_type_t {
@@ -87,6 +89,4 @@ private:
 
 WRITE_CLASS_ENCODER(EntityName)
 
-WRITE_EQ_OPERATORS_2(EntityName, type, id)
-
 #endif