diff options
| author | Timotej Lazar <timotej.lazar@araneo.si> | 2022-06-12 16:53:06 +0200 |
|---|---|---|
| committer | Timotej Lazar <timotej.lazar@araneo.si> | 2022-06-12 16:53:06 +0200 |
| commit | 1e38669119d4ce3e06bbad603799e32e6fd7feb2 (patch) | |
| tree | e787ac4dac41be1f8bcdbeab22c3bbee64f0d8b7 /src/win95/bmpnames.cpp | |
| parent | 0aa9a623f3b38e35b7f1cd26da0237beca2c9988 (diff) | |
Replace max macro with std::max in C++ code
Fixes compilation on Guix with gcc 12. Not sure which of those is
relevant.
Diffstat (limited to 'src/win95/bmpnames.cpp')
| -rw-r--r-- | src/win95/bmpnames.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/win95/bmpnames.cpp b/src/win95/bmpnames.cpp index b27e4ea..56c1282 100644 --- a/src/win95/bmpnames.cpp +++ b/src/win95/bmpnames.cpp @@ -1,3 +1,4 @@ +#include <algorithm> #include <string.h> #include "bmpnames.hpp" #include "mishchnk.hpp" @@ -128,7 +129,7 @@ Chunk_With_BMPs::Chunk_With_BMPs (Chunk_With_Children * parent, const char * con bn.priority = d2; bn.transparency_colour_union = d3; - max_index = max (bn.index, max_index); + max_index = std::max(bn.index, max_index); bmps.add_entry (bn); } |