From f3ab01604ca8a25a89540597640e794a145b0b17 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 30 Jul 2021 21:03:33 +0300 Subject: [PATCH] Version 2.9: Fix build on Linux. --- .gitmodules | 3 +++ Telegram/SourceFiles/calls/group/calls_group_members.cpp | 1 - .../SourceFiles/history/admin_log/history_admin_log_item.cpp | 4 ---- Telegram/SourceFiles/info/profile/info_profile_actions.cpp | 2 +- cmake | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index de0d2fa96..38c5797e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -91,3 +91,6 @@ [submodule "Telegram/lib_waylandshells"] path = Telegram/lib_waylandshells url = https://github.com/desktop-app/lib_waylandshells.git +[submodule "Telegram/ThirdParty/jemalloc"] + path = Telegram/ThirdParty/jemalloc + url = https://github.com/jemalloc/jemalloc diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.cpp b/Telegram/SourceFiles/calls/group/calls_group_members.cpp index c34947a0f..2604783bd 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp @@ -1906,7 +1906,6 @@ void Members::trackViewportGeometry() { bool aboutLimitShown) { if (placeholder > 0 || viewport <= 0 || !aboutLimitShown) { aboutLimitShown = false; - aboutLimit = 0; } // This call may update _videoAboutLimit->height() :( diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp index 15dd167b7..532a45f3c 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp @@ -596,10 +596,6 @@ void GenerateItems( )(tr::now, lt_from, fromLinkText); addSimpleServiceMessage(text); - auto bodyFlags = MessageFlag::Outgoing | MessageFlag::AdminLogEntry; - auto bodyReplyTo = MsgId(); - auto bodyViaBotId = UserId(); - auto bodyGroupedId = uint64(); auto newLink = newValue.isEmpty() ? TextWithEntities() : PrepareText( diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index d454ba05c..1c28c34c1 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -194,7 +194,7 @@ template bool SetClickContext( const ClickHandlerPtr &handler, const ClickContext &context) { - if (const auto casted = dynamic_pointer_cast(handler)) { + if (const auto casted = std::dynamic_pointer_cast(handler)) { casted->T::onClick(context); return true; } diff --git a/cmake b/cmake index 289bf222c..6602ed1ea 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 289bf222cad071aba5bb7d1928b2654bac3f4cf0 +Subproject commit 6602ed1ea085901fc5b556c4df8f6e3a0b7e52b3