MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove std::min usage

develop
Ben Lubar 2020-03-01 00:18:09 -06:00
parent 85bfa60cf2
commit 0c007c4699
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/devel/check-structures-sanity.cpp
Unescape Escape View File

@ -772,7 +772,7 @@ void Checker::queue_union_vector(const ToCheck & item, const ToCheck & tag_item)
auto union_base = *reinterpret_cast<void **>(item.ptr); auto union_base = *reinterpret_cast<void **>(item.ptr);
auto tag_base = *reinterpret_cast<void **>(tag_item.ptr); auto tag_base = *reinterpret_cast<void **>(tag_item.ptr);
auto count = std::min(union_count, tag_count); auto count = union_count < tag_count ? union_count : tag_count;
for (size_t i = 0; i < count; i++, union_base = PTR_ADD(union_base, union_type->byte_size()), tag_base = PTR_ADD(tag_base, tag_type->byte_size())) for (size_t i = 0; i < count; i++, union_base = PTR_ADD(union_base, union_type->byte_size()), tag_base = PTR_ADD(tag_base, tag_type->byte_size()))
{ {
ToCheck union_item(item, i, union_base, union_type); ToCheck union_item(item, i, union_base, union_type);