diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2021-01-08 10:16:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 11:16:18 +0100 |
| commit | 9b800a96ed32720ff60b74e498a0e0a6351004f9 (patch) | |
| tree | 3f287d339e15c4902ee415556475fd9b2918d33c /src/gfx_layout.cpp | |
| parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
| download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz | |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/gfx_layout.cpp')
| -rw-r--r-- | src/gfx_layout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp index ebd1afaa8..9f1f2742a 100644 --- a/src/gfx_layout.cpp +++ b/src/gfx_layout.cpp @@ -431,7 +431,7 @@ int FallbackParagraphLayout::FallbackLine::GetLeading() const { int leading = 0; for (const auto &run : *this) { - leading = max(leading, run.GetLeading()); + leading = std::max(leading, run.GetLeading()); } return leading; @@ -747,7 +747,7 @@ Dimension Layouter::GetBounds() { Dimension d = { 0, 0 }; for (const auto &l : *this) { - d.width = max<uint>(d.width, l->GetWidth()); + d.width = std::max<uint>(d.width, l->GetWidth()); d.height += l->GetLeading(); } return d; |