From ca1503c22fe5a8d1179fbeb5b9d8b16576732f5a Mon Sep 17 00:00:00 2001 From: levlam Date: Thu, 27 Dec 2018 22:24:44 +0300 Subject: [PATCH] Fix some includes. GitOrigin-RevId: a57e47e5925fe1e96080945d40641c84b4e30669 --- benchmark/bench_crypto.cpp | 1 - example/web/tdweb/src/wasm-utils.js | 4 ++-- td/mtproto/Handshake.h | 1 - td/mtproto/SessionConnection.cpp | 2 +- td/mtproto/Transport.h | 1 - td/mtproto/crypto.cpp | 1 - td/telegram/AuthManager.cpp | 1 + td/telegram/ConfigManager.h | 1 + td/telegram/DocumentsManager.cpp | 1 + td/telegram/Photo.cpp | 1 + td/telegram/SecureManager.h | 1 + td/telegram/SecureValue.cpp | 1 + td/telegram/files/FileBitmask.cpp | 2 ++ td/telegram/files/FileDownloader.h | 1 + td/telegram/files/FileEncryptionKey.h | 2 +- td/telegram/files/FileLoadManager.h | 1 + td/telegram/files/FileManager.cpp | 2 +- td/telegram/files/FileManager.h | 1 + td/telegram/files/FileManager.hpp | 1 + td/telegram/files/FileUploader.h | 1 + tdutils/td/utils/DecTree.h | 1 - tdutils/td/utils/tl_storers.h | 1 - tdutils/td/utils/utf8.h | 2 +- 23 files changed, 19 insertions(+), 12 deletions(-) diff --git a/benchmark/bench_crypto.cpp b/benchmark/bench_crypto.cpp index 30acbc16e..db763e73b 100644 --- a/benchmark/bench_crypto.cpp +++ b/benchmark/bench_crypto.cpp @@ -7,7 +7,6 @@ #include "td/utils/benchmark.h" #include "td/utils/crypto.h" -#include "td/utils/int_types.h" #include "td/utils/logging.h" #include "td/utils/port/thread.h" #include "td/utils/Random.h" diff --git a/example/web/tdweb/src/wasm-utils.js b/example/web/tdweb/src/wasm-utils.js index 9d0af6b6b..0b33dda9d 100644 --- a/example/web/tdweb/src/wasm-utils.js +++ b/example/web/tdweb/src/wasm-utils.js @@ -122,12 +122,12 @@ export function instantiateCachedURL(dbVersion, url, importObject) { export async function instantiateAny(version, url, importObject) { console.log("instantiate"); try { - return await instantiateStreaming(url, importObject); + return await instantiateStreaming(url, importObject); } catch (e) { console.log("instantiateSteaming failed", e); } try { - return await instantiateCachedURL(version, url, importObject); + return await instantiateCachedURL(version, url, importObject); } catch (e) { console.log("instantiateCachedURL failed", e); } diff --git a/td/mtproto/Handshake.h b/td/mtproto/Handshake.h index 6391943a4..ae8e58ff8 100644 --- a/td/mtproto/Handshake.h +++ b/td/mtproto/Handshake.h @@ -10,7 +10,6 @@ #include "td/mtproto/crypto.h" #include "td/utils/buffer.h" -#include "td/utils/int_types.h" #include "td/utils/Slice.h" #include "td/utils/Status.h" #include "td/utils/UInt.h" diff --git a/td/mtproto/SessionConnection.cpp b/td/mtproto/SessionConnection.cpp index a4dce7403..38106f7b9 100644 --- a/td/mtproto/SessionConnection.cpp +++ b/td/mtproto/SessionConnection.cpp @@ -85,7 +85,7 @@ namespace mtproto { * - ping_delay_disconnect#f3427b8c ping_id:long disconnect_delay:int = Pong; * * 6. New session creation - * Notification about new session. + * A notification about new session. * It is reasonable to store unique_id with current session, in order to process duplicated notifications once. * * Causes all older than first_msg_id to be re-sent. diff --git a/td/mtproto/Transport.h b/td/mtproto/Transport.h index 8ae5e4759..e6756b020 100644 --- a/td/mtproto/Transport.h +++ b/td/mtproto/Transport.h @@ -9,7 +9,6 @@ #include "td/mtproto/utils.h" #include "td/utils/common.h" -#include "td/utils/int_types.h" #include "td/utils/logging.h" #include "td/utils/Slice.h" #include "td/utils/Status.h" diff --git a/td/mtproto/crypto.cpp b/td/mtproto/crypto.cpp index 1aa34a2d4..29d93e7a7 100644 --- a/td/mtproto/crypto.cpp +++ b/td/mtproto/crypto.cpp @@ -10,7 +10,6 @@ #include "td/utils/as.h" #include "td/utils/crypto.h" -#include "td/utils/int_types.h" // for UInt256, UInt128, etc #include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/Random.h" diff --git a/td/telegram/AuthManager.cpp b/td/telegram/AuthManager.cpp index 892aeb5b2..854affb59 100644 --- a/td/telegram/AuthManager.cpp +++ b/td/telegram/AuthManager.cpp @@ -20,6 +20,7 @@ #include "td/telegram/net/NetQueryDispatcher.h" #include "td/telegram/PasswordManager.h" #include "td/telegram/Td.h" +#include "td/telegram/UniqueId.h" #include "td/telegram/UpdatesManager.h" #include "td/actor/PromiseFuture.h" diff --git a/td/telegram/ConfigManager.h b/td/telegram/ConfigManager.h index f0cccb3dc..3f841be82 100644 --- a/td/telegram/ConfigManager.h +++ b/td/telegram/ConfigManager.h @@ -15,6 +15,7 @@ #include "td/actor/actor.h" #include "td/actor/PromiseFuture.h" +#include "td/utils/logging.h" #include "td/utils/port/IPAddress.h" #include "td/utils/Slice.h" #include "td/utils/Status.h" diff --git a/td/telegram/DocumentsManager.cpp b/td/telegram/DocumentsManager.cpp index 5bd323cbd..0e1ddf2a5 100644 --- a/td/telegram/DocumentsManager.cpp +++ b/td/telegram/DocumentsManager.cpp @@ -8,6 +8,7 @@ #include "td/telegram/AnimationsManager.h" #include "td/telegram/AudiosManager.h" +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileManager.h" #include "td/telegram/Global.h" #include "td/telegram/net/DcId.h" diff --git a/td/telegram/Photo.cpp b/td/telegram/Photo.cpp index 225b3e879..af39fae93 100644 --- a/td/telegram/Photo.cpp +++ b/td/telegram/Photo.cpp @@ -9,6 +9,7 @@ #include "td/telegram/secret_api.h" #include "td/telegram/telegram_api.h" +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileManager.h" #include "td/telegram/Global.h" #include "td/telegram/net/DcId.h" diff --git a/td/telegram/SecureManager.h b/td/telegram/SecureManager.h index 06f2ad398..973b5b180 100644 --- a/td/telegram/SecureManager.h +++ b/td/telegram/SecureManager.h @@ -7,6 +7,7 @@ #pragma once #include "td/telegram/net/NetQuery.h" +#include "td/telegram/SecureStorage.h" #include "td/telegram/SecureValue.h" #include "td/telegram/UserId.h" diff --git a/td/telegram/SecureValue.cpp b/td/telegram/SecureValue.cpp index c1c0f2c57..c3e9e0ec7 100644 --- a/td/telegram/SecureValue.cpp +++ b/td/telegram/SecureValue.cpp @@ -7,6 +7,7 @@ #include "td/telegram/SecureValue.h" #include "td/telegram/DialogId.h" +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileManager.h" #include "td/telegram/Global.h" #include "td/telegram/misc.h" diff --git a/td/telegram/files/FileBitmask.cpp b/td/telegram/files/FileBitmask.cpp index 4e413d837..4c5e5a51e 100644 --- a/td/telegram/files/FileBitmask.cpp +++ b/td/telegram/files/FileBitmask.cpp @@ -7,7 +7,9 @@ #include "td/telegram/files/FileBitmask.h" #include "td/utils/common.h" +#include "td/utils/logging.h" #include "td/utils/misc.h" +#include "td/utils/ScopeGuard.h" namespace td { diff --git a/td/telegram/files/FileDownloader.h b/td/telegram/files/FileDownloader.h index 52c24ecef..1888099ce 100644 --- a/td/telegram/files/FileDownloader.h +++ b/td/telegram/files/FileDownloader.h @@ -8,6 +8,7 @@ #include "td/telegram/telegram_api.h" +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileLoader.h" #include "td/telegram/files/FileLocation.h" #include "td/telegram/net/DcId.h" diff --git a/td/telegram/files/FileEncryptionKey.h b/td/telegram/files/FileEncryptionKey.h index e585b8ea5..c60a3ceeb 100644 --- a/td/telegram/files/FileEncryptionKey.h +++ b/td/telegram/files/FileEncryptionKey.h @@ -18,7 +18,7 @@ namespace td { namespace secure_storage { class Secret; class ValueHash; -}; // namespace secure_storage +} // namespace secure_storage struct FileEncryptionKey { enum class Type : int32 { None, Secret, Secure }; diff --git a/td/telegram/files/FileLoadManager.h b/td/telegram/files/FileLoadManager.h index 504f49040..7215c01a6 100644 --- a/td/telegram/files/FileLoadManager.h +++ b/td/telegram/files/FileLoadManager.h @@ -10,6 +10,7 @@ #include "td/actor/PromiseFuture.h" #include "td/telegram/files/FileDownloader.h" +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileFromBytes.h" #include "td/telegram/files/FileHashUploader.h" #include "td/telegram/files/FileLocation.h" diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp index 39e57cb1b..e96340f5e 100644 --- a/td/telegram/files/FileManager.cpp +++ b/td/telegram/files/FileManager.cpp @@ -36,7 +36,7 @@ namespace td { namespace { constexpr int64 MAX_FILE_SIZE = 1500 * (1 << 20) /* 1500MB */; -} +} // namespace int VERBOSITY_NAME(update_file) = VERBOSITY_NAME(DEBUG); diff --git a/td/telegram/files/FileManager.h b/td/telegram/files/FileManager.h index b432a3faa..52dd0f560 100644 --- a/td/telegram/files/FileManager.h +++ b/td/telegram/files/FileManager.h @@ -11,6 +11,7 @@ #include "td/telegram/DialogId.h" #include "td/telegram/files/FileDb.h" +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileGenerateManager.h" #include "td/telegram/files/FileId.h" #include "td/telegram/files/FileLoadManager.h" diff --git a/td/telegram/files/FileManager.hpp b/td/telegram/files/FileManager.hpp index 55a328803..1c78f8922 100644 --- a/td/telegram/files/FileManager.hpp +++ b/td/telegram/files/FileManager.hpp @@ -7,6 +7,7 @@ #pragma once #include "td/telegram/DialogId.h" +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileManager.h" #include "td/telegram/Version.h" diff --git a/td/telegram/files/FileUploader.h b/td/telegram/files/FileUploader.h index 18f5feae1..879dc99a8 100644 --- a/td/telegram/files/FileUploader.h +++ b/td/telegram/files/FileUploader.h @@ -6,6 +6,7 @@ // #pragma once +#include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileLoader.h" #include "td/telegram/files/FileLocation.h" diff --git a/tdutils/td/utils/DecTree.h b/tdutils/td/utils/DecTree.h index 164da7371..8d79a0d55 100644 --- a/tdutils/td/utils/DecTree.h +++ b/tdutils/td/utils/DecTree.h @@ -7,7 +7,6 @@ #pragma once #include "td/utils/common.h" -#include "td/utils/int_types.h" #include "td/utils/logging.h" #include "td/utils/Random.h" diff --git a/tdutils/td/utils/tl_storers.h b/tdutils/td/utils/tl_storers.h index 4f6cee125..5462af094 100644 --- a/tdutils/td/utils/tl_storers.h +++ b/tdutils/td/utils/tl_storers.h @@ -7,7 +7,6 @@ #pragma once #include "td/utils/common.h" -#include "td/utils/int_types.h" #include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/Slice.h" diff --git a/tdutils/td/utils/utf8.h b/tdutils/td/utils/utf8.h index b719e664c..b6fef6f72 100644 --- a/tdutils/td/utils/utf8.h +++ b/tdutils/td/utils/utf8.h @@ -6,7 +6,7 @@ // #pragma once -#include "td/utils/int_types.h" +#include "td/utils/common.h" #include "td/utils/Slice.h" namespace td {