1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00

Fix old-style-cast build errors on BenchSpriteSort.cpp (#13148) (#13150)

This commit is contained in:
Keith Stellyes
2020-10-11 09:43:22 -07:00
committed by GitHub
parent cba1d48226
commit 2265938e9b

View File

@@ -40,7 +40,7 @@ static void fixup_pointers(paint_session* s, size_t paint_session_entries, size_
{
for (size_t j = 0; j < paint_struct_entries; j++)
{
if (s[i].PaintStructs[j].basic.next_quadrant_ps == (paint_struct*)paint_struct_entries)
if (s[i].PaintStructs[j].basic.next_quadrant_ps == reinterpret_cast<paint_struct*>(paint_struct_entries))
{
s[i].PaintStructs[j].basic.next_quadrant_ps = nullptr;
}
@@ -52,13 +52,13 @@ static void fixup_pointers(paint_session* s, size_t paint_session_entries, size_
}
for (size_t j = 0; j < quadrant_entries; j++)
{
if (s[i].Quadrants[j] == (paint_struct*)quadrant_entries)
if (s[i].Quadrants[j] == reinterpret_cast<paint_struct*>(quadrant_entries))
{
s[i].Quadrants[j] = nullptr;
}
else
{
s[i].Quadrants[j] = &s[i].PaintStructs[(size_t)s[i].Quadrants[j]].basic;
s[i].Quadrants[j] = &s[i].PaintStructs[reinterpret_cast<size_t>(s[i].Quadrants[j])].basic;
}
}
}
@@ -161,11 +161,11 @@ static int cmdline_for_bench_sprite_sort(int argc, const char** argv)
std::vector<paint_session> sessions(1);
for (auto& ps : sessions[0].PaintStructs)
{
ps.basic.next_quadrant_ps = (paint_struct*)(std::size(sessions[0].PaintStructs));
ps.basic.next_quadrant_ps = reinterpret_cast<paint_struct*>((std::size(sessions[0].PaintStructs)));
}
for (auto& quad : sessions[0].Quadrants)
{
quad = (paint_struct*)(std::size(sessions[0].Quadrants));
quad = reinterpret_cast<paint_struct*>((std::size(sessions[0].Quadrants)));
}
benchmark::RegisterBenchmark("baseline", BM_paint_session_arrange, sessions);
}