Update GSL to v3.0.1 and lib_base

* Use identical types for std::min.
This commit is contained in:
Nicholas Guriev
2020-05-01 10:47:08 +03:00
committed by John Preston
parent f76e094e98
commit 9828262a03
4 changed files with 5 additions and 5 deletions
@@ -40,8 +40,8 @@ int64_t File::Context::Seek(void *opaque, int64_t offset, int whence) {
}
int File::Context::read(bytes::span buffer) {
const auto amount = std::min(size_type(_size - _offset), buffer.size());
Assert(amount >= 0);
Assert(_size >= _offset);
const auto amount = std::min(std::size_t(_size - _offset), buffer.size());
if (unroll()) {
return -1;
@@ -707,7 +707,7 @@ int64 TlsSocket::read(bytes::span buffer) {
if (available <= 0) {
return written;
}
const auto write = std::min(index_type(available), buffer.size());
const auto write = std::min(std::size_t(available), buffer.size());
if (write <= 0) {
return written;
}