summaryrefslogtreecommitdiff
path: root/src/core/geometry_func.cpp
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/geometry_func.cpp
parentc1fddb9a6ae5c3af6865461a7295788a341011a2 (diff)
downloadopenttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/core/geometry_func.cpp')
-rw-r--r--src/core/geometry_func.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/geometry_func.cpp b/src/core/geometry_func.cpp
index 162f2eae5..89e70fb5b 100644
--- a/src/core/geometry_func.cpp
+++ b/src/core/geometry_func.cpp
@@ -22,7 +22,7 @@
Dimension maxdim(const Dimension &d1, const Dimension &d2)
{
Dimension d;
- d.width = max(d1.width, d2.width);
- d.height = max(d1.height, d2.height);
+ d.width = std::max(d1.width, d2.width);
+ d.height = std::max(d1.height, d2.height);
return d;
}