Core/Misc: Use boost::in_place() to initialize optionals.

* Improves commit 800d5d893964a822655
* Thanks @Shauren for this great suggestion.

5 files changed, 11 insertions, 11 deletions

diff --git a/src/server/game/Server/Packets/ItemPackets.cpp b/src/server/game/Server/Packets/ItemPackets.cpp
index 7e5550b971f..3feea2cdc98 100644
--- a/src/server/game/Server/Packets/ItemPackets.cpp
+++ b/src/server/game/Server/Packets/ItemPackets.cpp
@@ -104,7 +104,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Item::ItemBonusI
 {
     uint32 bonusListIdSize;
 
-    itemBonusInstanceData = WorldPackets::Item::ItemBonusInstanceData();
+    itemBonusInstanceData = boost::in_place();
 
     data >> itemBonusInstanceData->Context;
     data >> bonusListIdSize;
@@ -180,7 +180,7 @@ void WorldPackets::Item::ItemInstance::Initialize(::Item const* item)
     std::vector<uint32> const& bonusListIds = item->GetDynamicValues(ITEM_DYNAMIC_FIELD_BONUSLIST_IDS);
     if (!bonusListIds.empty())
     {
-        ItemBonus = WorldPackets::Item::ItemBonusInstanceData();
+        ItemBonus = boost::in_place();
         ItemBonus->BonusListIDs.insert(ItemBonus->BonusListIDs.end(), bonusListIds.begin(), bonusListIds.end());
         ItemBonus->Context = item->GetUInt32Value(ITEM_FIELD_CONTEXT);
     }
@@ -203,7 +203,7 @@ void WorldPackets::Item::ItemInstance::Initialize(::LootItem const& lootItem)
     RandomPropertiesID   = lootItem.randomPropertyId;
     if (!lootItem.BonusListIDs.empty())
     {
-        ItemBonus = ItemBonusInstanceData();
+        ItemBonus = boost::in_place();
         ItemBonus->BonusListIDs = lootItem.BonusListIDs;
         ItemBonus->Context = 0; /// @todo
     }
diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h
index 4ab2fe39fae..6803bdf3b95 100644
--- a/src/server/game/Server/Packets/MovementPackets.h
+++ b/src/server/game/Server/Packets/MovementPackets.h
@@ -175,13 +175,13 @@ namespace WorldPackets
 
         class TransferPending final : public ServerPacket
         {
-        public:
             struct ShipTransferPending
             {
                 uint32 ID = 0;              ///< gameobject_template.entry of the transport the player is teleporting on
                 int32 OriginMapID = -1;     ///< Map id the player is currently on (before teleport)
             };
 
+        public:
             TransferPending() : ServerPacket(SMSG_TRANSFER_PENDING, 16) { }
 
             WorldPacket const* Write() override;
diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp
index 341ca6c1128..421a2e9a46c 100644
--- a/src/server/game/Server/Packets/SpellPackets.cpp
+++ b/src/server/game/Server/Packets/SpellPackets.cpp
@@ -143,7 +143,7 @@ WorldPacket const* WorldPackets::Spells::AuraUpdate::Write()
 
 ByteBuffer& operator>>(ByteBuffer& buffer, Optional<WorldPackets::Spells::TargetLocation>& location)
 {
-    location = WorldPackets::Spells::TargetLocation();
+    location = boost::in_place();
     buffer >> location->Transport;
     buffer >> location->Location.m_positionX;
     buffer >> location->Location.m_positionY;
diff --git a/src/server/game/Server/Packets/TicketPackets.cpp b/src/server/game/Server/Packets/TicketPackets.cpp
index 4a73f9ea750..a91cdbec92a 100644
--- a/src/server/game/Server/Packets/TicketPackets.cpp
+++ b/src/server/game/Server/Packets/TicketPackets.cpp
@@ -236,7 +236,7 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketSubm
 
 ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketMailInfo>& mail)
 {
-    mail = WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketMailInfo();
+    mail = boost::in_place();
 
     data >> mail->MailID;
     uint16 bodyLength = data.ReadBits(13);
@@ -250,7 +250,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
 
 ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketCalendarEventInfo>& event)
 {
-    event = WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketCalendarEventInfo();
+    event = boost::in_place();
     data >> event->EventID;
     data >> event->InviteID;
     uint8 titleLength = data.ReadBits(8);
@@ -262,7 +262,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
 
 ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketPetInfo>& pet)
 {
-    pet = WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketPetInfo();
+    pet = boost::in_place();
     data >> pet->PetID;
     uint8 nameLength = data.ReadBits(8);
 
@@ -273,7 +273,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
 
 ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketGuildInfo>& guild)
 {
-    guild = WorldPackets::Ticket::SupportTicketSubmitComplaint::SupportTicketGuildInfo();
+    guild = boost::in_place();
     data >> guild->GuildID;
     uint8 nameLength = data.ReadBits(8);
 
@@ -284,7 +284,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
 
 ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketSubmitComplaint::Struct5E4383>& str)
 {
-    str = WorldPackets::Ticket::SupportTicketSubmitComplaint::Struct5E4383();
+    str = boost::in_place();
     data >> str->RideTicket;
     data >> str->_40;
     data >> str->_56;
diff --git a/src/server/game/Server/Packets/WhoPackets.cpp b/src/server/game/Server/Packets/WhoPackets.cpp
index 47b5b4da5a7..99ce0805e8b 100644
--- a/src/server/game/Server/Packets/WhoPackets.cpp
+++ b/src/server/game/Server/Packets/WhoPackets.cpp
@@ -41,7 +41,7 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Who::WhoWord& word)
 
 ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Who::WhoRequestServerInfo>& serverInfo)
 {
-    serverInfo = WorldPackets::Who::WhoRequestServerInfo();
+    serverInfo = boost::in_place();
 
     data >> serverInfo->FactionGroup;
     data >> serverInfo->Locale;