mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Code Issues Releases Wiki Activity

Use named casts instead of old-style casts

Browse Source 
Change prepared with clang-tidy and google-readability-casting check
This commit is contained in:
Michał Janiszewski
2020-04-22 17:09:29 +02:00
committed by GitHub
parent cfd94d4fa5
commit 2323cc1596
114 changed files with 604 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/core/MemoryStream.cpp
View File

@@ -45,7 +45,7 @@ MemoryStream::MemoryStream(void* data, size_t dataSize, uint8_t access)
}
MemoryStream::MemoryStream(const void* data, size_t dataSize)
: MemoryStream((void*)data, dataSize, MEMORY_ACCESS::READ)
: MemoryStream(const_cast<void*>(data), dataSize, MEMORY_ACCESS::READ)
{
}
@@ -115,7 +115,7 @@ uint64_t MemoryStream::GetLength() const
uint64_t MemoryStream::GetPosition() const
{
return (uint64_t)((uintptr_t)_position - (uintptr_t)_data);
return static_cast<uint64_t>((uintptr_t)_position - (uintptr_t)_data);
}
void MemoryStream::SetPosition(uint64_t position)
@@ -144,7 +144,7 @@ void MemoryStream::Seek(int64_t offset, int32_t origin)
{
throw IOException("New position out of bounds.");
}
_position = (void*)((uintptr_t)_data + (uintptr_t)newPosition);
_position = (void*)((uintptr_t)_data + static_cast<uintptr_t>(newPosition));
}
void MemoryStream::Read(void* buffer, uint64_t length)
@@ -200,7 +200,7 @@ void MemoryStream::Write(const void* buffer, uint64_t length)
{
if (_access & MEMORY_ACCESS::OWNER)
{
EnsureCapacity((size_t)nextPosition);
EnsureCapacity(static_cast<size_t>(nextPosition));
}
else
{
@@ -210,7 +210,7 @@ void MemoryStream::Write(const void* buffer, uint64_t length)
std::memcpy(_position, buffer, length);
_position = (void*)((uintptr_t)_position + length);
_dataSize = std::max<size_t>(_dataSize, (size_t)nextPosition);
_dataSize = std::max<size_t>(_dataSize, static_cast<size_t>(nextPosition));
}
void MemoryStream::Write1(const void* buffer)
@@ -251,6 +251,6 @@ void MemoryStream::EnsureCapacity(size_t capacity)
uint64_t position = GetPosition();
_dataCapacity = newCapacity;
_data = Memory::Reallocate(_data, _dataCapacity);
_position = (void*)((uintptr_t)_data + (uintptr_t)position);
_position = (void*)((uintptr_t)_data + static_cast<uintptr_t>(position));
}
}