summaryrefslogtreecommitdiff
path: root/src/core/smallmatrix_type.hpp
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2021-01-08 10:16:18 +0000
committerGitHub <noreply@github.com>2021-01-08 11:16:18 +0100
commit9b800a96ed32720ff60b74e498a0e0a6351004f9 (patch)
tree3f287d339e15c4902ee415556475fd9b2918d33c /src/core/smallmatrix_type.hpp
parentc1fddb9a6ae5c3af6865461a7295788a341011a2 (diff)
downloadopenttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/core/smallmatrix_type.hpp')
-rw-r--r--src/core/smallmatrix_type.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/smallmatrix_type.hpp b/src/core/smallmatrix_type.hpp
index 0aeac10e1..03fd1b790 100644
--- a/src/core/smallmatrix_type.hpp
+++ b/src/core/smallmatrix_type.hpp
@@ -234,7 +234,7 @@ public:
if (x * new_height > new_capacity) continue;
(*copy)(new_data + (x - 1) * new_height,
this->data + (x - 1) * this->height,
- min(this->height, new_height));
+ std::min(this->height, new_height));
}
} else {
/* If matrix is shrinking copy from the front. */
@@ -242,7 +242,7 @@ public:
if ((x + 1) * new_height > new_capacity) break;
(*copy)(new_data + x * new_height,
this->data + x * this->height,
- min(this->height, new_height));
+ std::min(this->height, new_height));
}
}
}