summaryrefslogtreecommitdiff
path: root/src/ini_load.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/ini_load.cpp
parentc1fddb9a6ae5c3af6865461a7295788a341011a2 (diff)
downloadopenttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/ini_load.cpp')
-rw-r--r--src/ini_load.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ini_load.cpp b/src/ini_load.cpp
index 022e2bf18..5c208548f 100644
--- a/src/ini_load.cpp
+++ b/src/ini_load.cpp
@@ -226,7 +226,7 @@ void IniLoadFile::LoadFromDisk(const std::string &filename, Subdirectory subdir)
uint a = comment_alloc;
/* add to comment */
if (ns > a) {
- a = max(a, 128U);
+ a = std::max(a, 128U);
do a *= 2; while (a < ns);
comment = ReallocT(comment, comment_alloc = a);
}