diff options
author | Shauren <shauren.trinity@gmail.com> | 2022-11-06 01:03:35 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-11-06 01:03:35 +0100 |
commit | fc37c42e55162d834821f611e308727900cb3a32 (patch) | |
tree | 44b6d778e536945bfcba420c7cfa8d05f3c32d0d | |
parent | c9f1606b760d724851c12a6bc13405a3ec03cc0c (diff) |
Core/Misc: Added noexcept to move constructors and move assignment operators
-rw-r--r-- | src/common/Utilities/MessageBuffer.h | 4 | ||||
-rw-r--r-- | src/common/Utilities/TaskScheduler.h | 4 | ||||
-rw-r--r-- | src/server/database/Database/QueryCallback.cpp | 8 | ||||
-rw-r--r-- | src/server/database/Database/QueryCallback.h | 4 | ||||
-rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Object/ObjectGuid.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateData.h | 2 | ||||
-rw-r--r-- | src/server/game/Globals/AreaTriggerDataStore.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSplineInitArgs.h | 2 | ||||
-rw-r--r-- | src/server/game/Scripting/ScriptReloadMgr.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Spells/SpellMgr.h | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/src/common/Utilities/MessageBuffer.h b/src/common/Utilities/MessageBuffer.h index bdd4ce03405..322a15992ab 100644 --- a/src/common/Utilities/MessageBuffer.h +++ b/src/common/Utilities/MessageBuffer.h @@ -41,7 +41,7 @@ public: { } - MessageBuffer(MessageBuffer&& right) : _wpos(right._wpos), _rpos(right._rpos), _storage(right.Move()) { } + MessageBuffer(MessageBuffer&& right) noexcept : _wpos(right._wpos), _rpos(right._rpos), _storage(right.Move()) { } void Reset() { @@ -118,7 +118,7 @@ public: return *this; } - MessageBuffer& operator=(MessageBuffer&& right) + MessageBuffer& operator=(MessageBuffer&& right) noexcept { if (this != &right) { diff --git a/src/common/Utilities/TaskScheduler.h b/src/common/Utilities/TaskScheduler.h index 6bd50cf5b6d..44267a526b3 100644 --- a/src/common/Utilities/TaskScheduler.h +++ b/src/common/Utilities/TaskScheduler.h @@ -424,7 +424,7 @@ public: : _task(right._task), _owner(right._owner), _consumed(right._consumed) { } // Move construct - TaskContext(TaskContext&& right) + TaskContext(TaskContext&& right) noexcept : _task(std::move(right._task)), _owner(std::move(right._owner)), _consumed(std::move(right._consumed)) { } // Copy assign @@ -437,7 +437,7 @@ public: } // Move assign - TaskContext& operator= (TaskContext&& right) + TaskContext& operator= (TaskContext&& right) noexcept { _task = std::move(right._task); _owner = std::move(right._owner); diff --git a/src/server/database/Database/QueryCallback.cpp b/src/server/database/Database/QueryCallback.cpp index 02365a76fe7..c8b3295fe39 100644 --- a/src/server/database/Database/QueryCallback.cpp +++ b/src/server/database/Database/QueryCallback.cpp @@ -66,13 +66,13 @@ public: QueryCallbackData(std::function<void(QueryCallback&, QueryResult)>&& callback) : _string(std::move(callback)), _isPrepared(false) { } QueryCallbackData(std::function<void(QueryCallback&, PreparedQueryResult)>&& callback) : _prepared(std::move(callback)), _isPrepared(true) { } - QueryCallbackData(QueryCallbackData&& right) + QueryCallbackData(QueryCallbackData&& right) noexcept { _isPrepared = right._isPrepared; ConstructActiveMember(this); MoveFrom(this, std::move(right)); } - QueryCallbackData& operator=(QueryCallbackData&& right) + QueryCallbackData& operator=(QueryCallbackData&& right) noexcept { if (this != &right) { @@ -117,7 +117,7 @@ QueryCallback::QueryCallback(std::future<PreparedQueryResult>&& result) Construct(_prepared, std::move(result)); } -QueryCallback::QueryCallback(QueryCallback&& right) +QueryCallback::QueryCallback(QueryCallback&& right) noexcept { _isPrepared = right._isPrepared; ConstructActiveMember(this); @@ -125,7 +125,7 @@ QueryCallback::QueryCallback(QueryCallback&& right) _callbacks = std::move(right._callbacks); } -QueryCallback& QueryCallback::operator=(QueryCallback&& right) +QueryCallback& QueryCallback::operator=(QueryCallback&& right) noexcept { if (this != &right) { diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h index 76c52447750..f788cc41baa 100644 --- a/src/server/database/Database/QueryCallback.h +++ b/src/server/database/Database/QueryCallback.h @@ -29,8 +29,8 @@ class TC_DATABASE_API QueryCallback public: explicit QueryCallback(QueryResultFuture&& result); explicit QueryCallback(PreparedQueryResultFuture&& result); - QueryCallback(QueryCallback&& right); - QueryCallback& operator=(QueryCallback&& right); + QueryCallback(QueryCallback&& right) noexcept; + QueryCallback& operator=(QueryCallback&& right) noexcept; ~QueryCallback(); QueryCallback&& WithCallback(std::function<void(QueryResult)>&& callback); diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index c1b2f0d94d2..8a0f62236d1 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -189,7 +189,7 @@ namespace std template<> struct hash<AuctionsBucketKey> { - size_t operator()(AuctionsBucketKey const& key) const + size_t operator()(AuctionsBucketKey const& key) const noexcept { return AuctionsBucketKey::Hash(key); } diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 7a49c7c95f1..6d0a4187ee6 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -431,7 +431,7 @@ namespace std struct hash<ObjectGuid> { public: - size_t operator()(ObjectGuid const& key) const + size_t operator()(ObjectGuid const& key) const noexcept { return key.GetHash(); } diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index 910282435dd..3dc50bde23d 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -37,7 +37,7 @@ class UpdateData { public: UpdateData(uint32 map); - UpdateData(UpdateData&& right) : m_map(right.m_map), m_blockCount(right.m_blockCount), + UpdateData(UpdateData&& right) noexcept : m_map(right.m_map), m_blockCount(right.m_blockCount), m_outOfRangeGUIDs(std::move(right.m_outOfRangeGUIDs)), m_data(std::move(right.m_data)) { diff --git a/src/server/game/Globals/AreaTriggerDataStore.cpp b/src/server/game/Globals/AreaTriggerDataStore.cpp index d601db8728a..69c06262b07 100644 --- a/src/server/game/Globals/AreaTriggerDataStore.cpp +++ b/src/server/game/Globals/AreaTriggerDataStore.cpp @@ -37,7 +37,7 @@ namespace std template <> struct hash<AreaTriggerId> { - std::size_t operator()(AreaTriggerId const& value) const + std::size_t operator()(AreaTriggerId const& value) const noexcept { size_t hashVal = 0; Trinity::hash_combine(hashVal, value.Id); diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 11d73d70e6b..107f8a31d01 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -274,7 +274,7 @@ walk(false), HasVelocity(false), TransformForTransport(true) path.reserve(path_capacity); } -MoveSplineInitArgs::MoveSplineInitArgs(MoveSplineInitArgs&& args) = default; +MoveSplineInitArgs::MoveSplineInitArgs(MoveSplineInitArgs&& args) noexcept = default; MoveSplineInitArgs::~MoveSplineInitArgs() = default; diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h index 3701fec1ec5..d8c68c11d66 100644 --- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h @@ -62,7 +62,7 @@ namespace Movement struct MoveSplineInitArgs { explicit MoveSplineInitArgs(size_t path_capacity = 16); - MoveSplineInitArgs(MoveSplineInitArgs&& args); + MoveSplineInitArgs(MoveSplineInitArgs&& args) noexcept; ~MoveSplineInitArgs(); PointsArray path; diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index ff842ee2bc1..3c607418649 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -352,7 +352,7 @@ namespace std { hash<string> hasher; - std::size_t operator()(fs::path const& key) const + std::size_t operator()(fs::path const& key) const noexcept { return hasher(key.generic_string()); } diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 7bc83a5ee5e..7be029d92f3 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -359,7 +359,7 @@ namespace std template<> struct hash<SpellGroup> { - size_t operator()(SpellGroup const& group) const + size_t operator()(SpellGroup const& group) const noexcept { return hash<uint32>()(uint32(group)); } |