crimson/os: do not use WRITE_*_OPERATORS_{3,4}()

the default-generated comparison operator is able to fulfill our needs
already.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
index 004a5778001c84f7e01780ea9e3b90b3a752e369..f8fc2bff32bacc785e096640261da5a9cd12b95f 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
+++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
@@ -44,13 +44,8 @@ struct lba_map_val_t {
     uint32_t refcount,
     uint32_t checksum)
     : len(len), paddr(paddr), refcount(refcount), checksum(checksum) {}
+  bool operator==(const lba_map_val_t&) const = default;
 };
-WRITE_EQ_OPERATORS_4(
-  lba_map_val_t,
-  len,
-  paddr,
-  refcount,
-  checksum);
 
 std::ostream& operator<<(std::ostream& out, const lba_map_val_t&);
 

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index e4f4fa61e8c6522442ed4890c8497015e940fd64..5689d6754e0871811bc7e7d70959586235f47125 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -15,7 +15,6 @@
 #include "include/byteorder.h"
 #include "include/denc.h"
 #include "include/buffer.h"
-#include "include/cmp.h"
 #include "include/uuid.h"
 #include "include/interval_set.h"
 
@@ -564,15 +563,8 @@ public:
   friend struct paddr_le_t;
   friend struct seg_paddr_t;
 
-  friend bool operator==(const paddr_t &, const paddr_t&);
-  friend bool operator!=(const paddr_t &, const paddr_t&);
-  friend bool operator<=(const paddr_t &, const paddr_t&);
-  friend bool operator<(const paddr_t &, const paddr_t&);
-  friend bool operator>=(const paddr_t &, const paddr_t&);
-  friend bool operator>(const paddr_t &, const paddr_t&);
+  auto operator<=>(const paddr_t &) const = default;
 };
-WRITE_EQ_OPERATORS_1(paddr_t, dev_addr);
-WRITE_CMP_OPERATORS_1(paddr_t, dev_addr);
 
 std::ostream &operator<<(std::ostream &out, const paddr_t &rhs);
 
@@ -1593,8 +1585,9 @@ struct record_size_t {
   }
 
   void account(const delta_info_t& delta);
+
+  bool operator==(const record_size_t &) const = default;
 };
-WRITE_EQ_OPERATORS_2(record_size_t, plain_mdlength, dlength);
 std::ostream &operator<<(std::ostream&, const record_size_t&);
 
 struct record_t {
@@ -1739,8 +1732,9 @@ struct record_group_size_t {
 
   void account(const record_size_t& rsize,
                extent_len_t block_size);
+
+  bool operator==(const record_group_size_t &) const = default;
 };
-WRITE_EQ_OPERATORS_3(record_group_size_t, plain_mdlength, dlength, block_size);
 std::ostream& operator<<(std::ostream&, const record_group_size_t&);
 
 struct record_group_t {