diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index cb66ebc6cf..d89cec441a 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -9,7 +9,7 @@ static constexpr uint32_t InvalidTick = 0xFFFFFFFF; struct GameStateSnapshot_t { - GameStateSnapshot_t& operator=(GameStateSnapshot_t&& mv) + GameStateSnapshot_t& operator=(GameStateSnapshot_t&& mv) noexcept { tick = mv.tick; storedSprites = std::move(mv.storedSprites); diff --git a/src/openrct2/core/MemoryStream.cpp b/src/openrct2/core/MemoryStream.cpp index c4a58f8cab..dceec747e5 100644 --- a/src/openrct2/core/MemoryStream.cpp +++ b/src/openrct2/core/MemoryStream.cpp @@ -49,7 +49,7 @@ MemoryStream::MemoryStream(const void* data, size_t dataSize) { } -MemoryStream::MemoryStream(MemoryStream&& mv) +MemoryStream::MemoryStream(MemoryStream&& mv) noexcept { *this = std::move(mv); } @@ -65,7 +65,7 @@ MemoryStream::~MemoryStream() _data = nullptr; } -MemoryStream& MemoryStream::operator=(MemoryStream&& mv) +MemoryStream& MemoryStream::operator=(MemoryStream&& mv) noexcept { _access = mv._access; _dataCapacity = mv._dataCapacity; diff --git a/src/openrct2/core/MemoryStream.h b/src/openrct2/core/MemoryStream.h index 3d322a8ffb..0d313654e2 100644 --- a/src/openrct2/core/MemoryStream.h +++ b/src/openrct2/core/MemoryStream.h @@ -36,13 +36,13 @@ private: public: MemoryStream() = default; MemoryStream(const MemoryStream& copy); - MemoryStream(MemoryStream&& mv); + MemoryStream(MemoryStream&& mv) noexcept; explicit MemoryStream(size_t capacity); MemoryStream(void* data, size_t dataSize, uint8_t access = MEMORY_ACCESS::READ); MemoryStream(const void* data, size_t dataSize); virtual ~MemoryStream(); - MemoryStream& operator=(MemoryStream&& mv); + MemoryStream& operator=(MemoryStream&& mv) noexcept; const void* GetData() const override; void* GetDataCopy() const;