1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00

Update to new style casts

This commit is contained in:
Michał Janiszewski
2020-12-28 23:53:37 +01:00
parent 6a6e58c088
commit a8c3ca72ed

View File

@@ -86,7 +86,7 @@ static void BM_update(benchmark::State& state, const std::string& filename)
} }
} }
static int cmdline_for_bench_sprite_sort(int argc, const char** argv) static int cmdline_for_bench_sprite_sort(int argc, const char* const* argv)
{ {
// Add a baseline test on an empty park // Add a baseline test on an empty park
benchmark::RegisterBenchmark("baseline", BM_update, std::string{}); benchmark::RegisterBenchmark("baseline", BM_update, std::string{});
@@ -108,11 +108,11 @@ static int cmdline_for_bench_sprite_sort(int argc, const char** argv)
} }
else else
{ {
argv_for_benchmark.push_back((char*)argv[i]); argv_for_benchmark.push_back(const_cast<char*>(argv[i]));
} }
} }
// Update argc with all the changes made // Update argc with all the changes made
argc = (int)argv_for_benchmark.size(); argc = static_cast<int>(argv_for_benchmark.size());
::benchmark::Initialize(&argc, &argv_for_benchmark[0]); ::benchmark::Initialize(&argc, &argv_for_benchmark[0]);
if (::benchmark::ReportUnrecognizedArguments(argc, &argv_for_benchmark[0])) if (::benchmark::ReportUnrecognizedArguments(argc, &argv_for_benchmark[0]))
return -1; return -1;
@@ -126,7 +126,7 @@ static int cmdline_for_bench_sprite_sort(int argc, const char** argv)
static exitcode_t HandleBenchUpdate(CommandLineArgEnumerator* argEnumerator) static exitcode_t HandleBenchUpdate(CommandLineArgEnumerator* argEnumerator)
{ {
const char** argv = (const char**)argEnumerator->GetArguments() + argEnumerator->GetIndex(); const char* const* argv = static_cast<const char* const*>(argEnumerator->GetArguments()) + argEnumerator->GetIndex();
int32_t argc = argEnumerator->GetCount() - argEnumerator->GetIndex(); int32_t argc = argEnumerator->GetCount() - argEnumerator->GetIndex();
int32_t result = cmdline_for_bench_sprite_sort(argc, argv); int32_t result = cmdline_for_bench_sprite_sort(argc, argv);
if (result < 0) if (result < 0)