mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into temp

Browse Source 
Conflicts:
	Telegram/SourceFiles/settings/settings_widget.cpp
This commit is contained in:
John Preston
2017-02-18 14:37:57 +03:00
parent 8060c7e141 540ba9bfaf
commit 36fc7d1991
7 changed files with 81 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/historywidget.cpp
View File

@@ -185,7 +185,8 @@ namespace {
// is applied once for blocks list in a history and once for items list in the found block
template <bool TopToBottom, typename T>
int binarySearchBlocksOrItems(const T &list, int edge) {
auto start = 0, end = list.size();
// static_cast to work around GCC bug #78693
auto start = 0, end = static_cast<int>(list.size());
while (end - start > 1) {
auto middle = (start + end) / 2;
auto top = list[middle]->y;