summaryrefslogtreecommitdiff
path: root/src/openttd.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/openttd.cpp
parentc1fddb9a6ae5c3af6865461a7295788a341011a2 (diff)
downloadopenttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/openttd.cpp')
-rw-r--r--src/openttd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 6315b8fa1..41900933a 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -290,8 +290,8 @@ static void ParseResolution(Dimension *res, const char *s)
return;
}
- res->width = max(strtoul(s, nullptr, 0), 64UL);
- res->height = max(strtoul(t + 1, nullptr, 0), 64UL);
+ res->width = std::max(strtoul(s, nullptr, 0), 64UL);
+ res->height = std::max(strtoul(t + 1, nullptr, 0), 64UL);
}