From a3c46b7249e01c29b4c1cf15db1cda311166d87b Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 16 Jul 2023 15:54:24 +0200 Subject: [PATCH] Core/Misc: mark a couple ctors as noexcept to silence warnings --- src/server/game/Entities/Object/ObjectGuid.h | 4 ++-- src/server/game/Server/WorldPacket.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 2bc16e2ce2..a330622f97 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -145,10 +145,10 @@ class TC_GAME_API ObjectGuid ObjectGuid(HighGuid hi, uint32 entry, uint32 counter) { _data._guid = counter ? uint64(counter) | (uint64(entry) << 32) | (uint64(hi) << ((hi == HighGuid::Corpse || hi == HighGuid::AreaTrigger) ? 48 : 52)) : 0; } ObjectGuid(HighGuid hi, uint32 counter) { _data._guid = counter ? uint64(counter) | (uint64(hi) << ((hi == HighGuid::Corpse || hi == HighGuid::AreaTrigger) ? 48 : 52)) : 0; } ObjectGuid(ObjectGuid const& r) : _data(r._data) { } - ObjectGuid(ObjectGuid&& r) : _data(r._data) { } + ObjectGuid(ObjectGuid&& r) noexcept : _data(r._data) { } ObjectGuid& operator=(ObjectGuid const& r) { _data = r._data; return *this; } - ObjectGuid& operator=(ObjectGuid&& r) { _data = r._data; return *this; } + ObjectGuid& operator=(ObjectGuid&& r) noexcept { _data = r._data; return *this; } operator uint64() const { return _data._guid; } PackedGuidReader ReadAsPacked() { return PackedGuidReader(*this); } diff --git a/src/server/game/Server/WorldPacket.h b/src/server/game/Server/WorldPacket.h index a51c09b35c..4615e95be6 100644 --- a/src/server/game/Server/WorldPacket.h +++ b/src/server/game/Server/WorldPacket.h @@ -36,7 +36,7 @@ class WorldPacket : public ByteBuffer WorldPacket(uint16 opcode, size_t res = 200, ConnectionType connection = CONNECTION_TYPE_DEFAULT) : ByteBuffer(res), m_opcode(opcode), _connection(connection), _compressionStream(nullptr) { } - WorldPacket(WorldPacket&& packet) : ByteBuffer(std::move(packet)), m_opcode(packet.m_opcode), _connection(packet._connection), _compressionStream(nullptr) + WorldPacket(WorldPacket&& packet) noexcept : ByteBuffer(std::move(packet)), m_opcode(packet.m_opcode), _connection(packet._connection), _compressionStream(nullptr) { } @@ -60,7 +60,7 @@ class WorldPacket : public ByteBuffer return *this; } - WorldPacket& operator=(WorldPacket&& right) + WorldPacket& operator=(WorldPacket&& right) noexcept { if (this != &right) {