Core/Misc: Modernize comparison operators

2 files changed, 3 insertions, 38 deletions

diff --git a/src/server/game/Server/Packets/ItemPacketsCommon.cpp b/src/server/game/Server/Packets/ItemPacketsCommon.cpp
index 70da5777d07..0843a4091e8 100644
--- a/src/server/game/Server/Packets/ItemPacketsCommon.cpp
+++ b/src/server/game/Server/Packets/ItemPacketsCommon.cpp
@@ -33,10 +33,7 @@ bool ItemBonuses::operator==(ItemBonuses const& r) const
     return std::is_permutation(BonusListIDs.begin(), BonusListIDs.end(), r.BonusListIDs.begin());
 }
 
-bool ItemMod::operator==(ItemMod const& r) const
-{
-    return Value == r.Value && Type == r.Type;
-}
+bool ItemMod::operator==(ItemMod const& r) const = default;
 
 bool ItemModList::operator==(ItemModList const& r) const
 {
@@ -107,36 +104,9 @@ void ItemInstance::Initialize(::VoidStorageItem const* voidItem)
     }
 }
 
-bool ItemInstance::operator==(ItemInstance const& r) const
-{
-    if (ItemID != r.ItemID)
-        return false;
-
-    if (ItemBonus.has_value() != r.ItemBonus.has_value())
-        return false;
-
-    if (Modifications != r.Modifications)
-        return false;
-
-    if (ItemBonus.has_value() && *ItemBonus != *r.ItemBonus)
-        return false;
-
-    return true;
-}
-
-bool ItemBonusKey::operator==(ItemBonusKey const& right) const
-{
-    if (ItemID != right.ItemID)
-        return false;
-
-    if (BonusListIDs != right.BonusListIDs)
-        return false;
+bool ItemInstance::operator==(ItemInstance const& r) const = default;
 
-    if (Modifications != right.Modifications)
-        return false;
-
-    return true;
-}
+bool ItemBonusKey::operator==(ItemBonusKey const& right) const = default;
 
 ByteBuffer& operator<<(ByteBuffer& data, ItemBonuses const& itemBonusInstanceData)
 {
diff --git a/src/server/game/Server/Packets/ItemPacketsCommon.h b/src/server/game/Server/Packets/ItemPacketsCommon.h
index b70cb8b1491..a9fb6ce95ce 100644
--- a/src/server/game/Server/Packets/ItemPacketsCommon.h
+++ b/src/server/game/Server/Packets/ItemPacketsCommon.h
@@ -44,7 +44,6 @@ namespace WorldPackets
             std::vector<int32> BonusListIDs;
 
             bool operator==(ItemBonuses const& r) const;
-            bool operator!=(ItemBonuses const& r) const { return !(*this == r); }
         };
 
         struct ItemMod
@@ -56,7 +55,6 @@ namespace WorldPackets
             ItemModifier Type = MAX_ITEM_MODIFIERS;
 
             bool operator==(ItemMod const& r) const;
-            bool operator!=(ItemMod const& r) const { return !(*this == r); }
         };
 
         struct ItemModList
@@ -64,7 +62,6 @@ namespace WorldPackets
             Array<ItemMod, MAX_ITEM_MODIFIERS> Values;
 
             bool operator==(ItemModList const& r) const;
-            bool operator!=(ItemModList const& r) const { return !(*this == r); }
         };
 
         struct ItemInstance
@@ -79,7 +76,6 @@ namespace WorldPackets
             ItemModList Modifications;
 
             bool operator==(ItemInstance const& r) const;
-            bool operator!=(ItemInstance const& r) const { return !(*this == r); }
         };
 
         struct ItemBonusKey
@@ -89,7 +85,6 @@ namespace WorldPackets
             std::vector<ItemMod> Modifications;
 
             bool operator==(ItemBonusKey const& right) const;
-            bool operator!=(ItemBonusKey const& r) const { return !(*this == r); }
         };
 
         struct ItemEnchantData