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/network/network_client.cpp | |
parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/network/network_client.cpp')
-rw-r--r-- | src/network/network_client.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 343f71eb7..7a7ec9f21 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -68,7 +68,7 @@ struct PacketReader : LoadFilter { assert(this->read_bytes == 0); size_t in_packet = p->size - p->pos; - size_t to_write = min((size_t)(this->bufe - this->buf), in_packet); + size_t to_write = std::min<size_t>(this->bufe - this->buf, in_packet); const byte *pbuf = p->buffer + p->pos; this->written_bytes += in_packet; @@ -93,7 +93,7 @@ struct PacketReader : LoadFilter { size_t Read(byte *rbuf, size_t size) override { /* Limit the amount to read to whatever we still have. */ - size_t ret_size = size = min(this->written_bytes - this->read_bytes, size); + size_t ret_size = size = std::min(this->written_bytes - this->read_bytes, size); this->read_bytes += ret_size; const byte *rbufe = rbuf + ret_size; @@ -103,7 +103,7 @@ struct PacketReader : LoadFilter { this->bufe = this->buf + CHUNK; } - size_t to_write = min(this->bufe - this->buf, rbufe - rbuf); + size_t to_write = std::min(this->bufe - this->buf, rbufe - rbuf); memcpy(rbuf, this->buf, to_write); rbuf += to_write; this->buf += to_write; |