diff --git a/example/android/README.md b/example/android/README.md index 0939ff860..2dfe14c4c 100644 --- a/example/android/README.md +++ b/example/android/README.md @@ -15,6 +15,6 @@ If you already have installed Android SDK and NDK, you can skip the second step If you want to update TDLib to a newer version, you need to run only the script `./build-tdlib.sh`. -You can specify different OpenSSL version as the third parameter to the script `./build-openssl.sh`. By default OpenSSL 1.1.1 is used because of much smaller binary footprint then newer OpenSSL versions. +You can specify different OpenSSL version as the third parameter to the script `./build-openssl.sh`. By default OpenSSL 1.1.1 is used because of much smaller binary footprint than newer OpenSSL versions. You can build TDLib against shared standard C++ library by specifying "c++_shared" as the third parameter to the script `./build-tdlib.sh`. This can reduce total app size if you have a lot of other C++ code and want it to use the same shared library. diff --git a/td/telegram/FileReferenceManager.h b/td/telegram/FileReferenceManager.h index 0151c4668..c16976624 100644 --- a/td/telegram/FileReferenceManager.h +++ b/td/telegram/FileReferenceManager.h @@ -188,7 +188,7 @@ class FileReferenceManager final : public Actor { FileSourceId get_current_file_source_id() const; - void tear_down() override; + void tear_down() final; }; } // namespace td diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp index 6804bc81b..23c388681 100644 --- a/td/telegram/StickersManager.cpp +++ b/td/telegram/StickersManager.cpp @@ -22,6 +22,7 @@ #include "td/telegram/Global.h" #include "td/telegram/LanguagePackManager.h" #include "td/telegram/logevent/LogEvent.h" +#include "td/telegram/logevent/LogEventHelper.h" #include "td/telegram/MessagesManager.h" #include "td/telegram/misc.h" #include "td/telegram/net/DcId.h" @@ -3929,7 +3930,7 @@ vector StickersManager::get_stickers(StickerType sticker_type, string em vector examined_sticker_set_ids = installed_sticker_set_ids_[type]; if (!emoji.empty() && sticker_type == StickerType::CustomEmoji) { - td::append(examined_sticker_set_ids, featured_sticker_set_ids_[type]); + append(examined_sticker_set_ids, featured_sticker_set_ids_[type]); } vector sets_to_load;