Codechange: Remove min/max functions in favour of STL variants (#8502)
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user