RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-01 04:32:09 +00:00
Code Issues Projects Releases Wiki Activity

Update GSL to v3.0.1 and lib_base

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
View File

@ -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;

2
Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
View File

@ -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;
}

2
Telegram/ThirdParty/GSL vendored

@ -1 +1 @@
Subproject commit d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
Subproject commit 1999b48a519196711f0d03af3b7eedd49fcc6db3

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit f8f796038cc936948ef223a22ec548aa63f48aeb
Subproject commit d27c3e363254b169f8886934df8580fdc76d424e