diff options
| author | levlam <levlam@telegram.org> | 2025-02-13 21:44:21 +0300 |
|---|---|---|
| committer | levlam <levlam@telegram.org> | 2025-02-13 21:44:21 +0300 |
| commit | b5495217146b846d8f836771649616c057c5742d (patch) | |
| tree | 1e708a716d230ca9fdb5c9b195a874ef0f8c370f | |
| parent | c23abe99eff56620fb690aa23b1ae64a3a448bd1 (diff) | |
Remove duplicate declarations of constexpr variables.
| -rw-r--r-- | td/telegram/Client.cpp | 1 | ||||
| -rw-r--r-- | td/telegram/ConfigManager.cpp | 5 | ||||
| -rw-r--r-- | td/telegram/MessageContent.cpp | 2 | ||||
| -rw-r--r-- | td/telegram/SecretChatActor.cpp | 4 | ||||
| -rw-r--r-- | tdnet/td/net/HttpReader.cpp | 2 | ||||
| -rw-r--r-- | test/query_merger.cpp | 4 |
6 files changed, 2 insertions, 16 deletions
diff --git a/td/telegram/Client.cpp b/td/telegram/Client.cpp index 0a12cb506..afb01e776 100644 --- a/td/telegram/Client.cpp +++ b/td/telegram/Client.cpp @@ -423,7 +423,6 @@ class MultiImpl { static std::atomic<uint32> current_id_; }; -constexpr int32 MultiImpl::ADDITIONAL_THREAD_COUNT; std::atomic<uint32> MultiImpl::current_id_{1}; class MultiImplPool { diff --git a/td/telegram/ConfigManager.cpp b/td/telegram/ConfigManager.cpp index 6dde9c3eb..c7116c26f 100644 --- a/td/telegram/ConfigManager.cpp +++ b/td/telegram/ConfigManager.cpp @@ -883,8 +883,7 @@ ActorShared<> ConfigManager::create_reference() { } void ConfigManager::hangup_shared() { - LOG_CHECK(get_link_token() == REFCNT_TOKEN) - << "Expected link token " << REFCNT_TOKEN << ", but receive " << get_link_token(); + LOG_CHECK(get_link_token() == REFCNT_TOKEN) << "Receive link token " << get_link_token(); ref_cnt_--; try_stop(); } @@ -2248,6 +2247,4 @@ void ConfigManager::process_app_config(tl_object_ptr<telegram_api::JSONValue> &c } } -constexpr uint64 ConfigManager::REFCNT_TOKEN; - } // namespace td diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp index 7052bf983..3c920308c 100644 --- a/td/telegram/MessageContent.cpp +++ b/td/telegram/MessageContent.cpp @@ -761,8 +761,6 @@ class MessageDice final : public MessageContent { } }; -constexpr const char *MessageDice::DEFAULT_EMOJI; - class MessageProximityAlertTriggered final : public MessageContent { public: DialogId traveler_dialog_id; diff --git a/td/telegram/SecretChatActor.cpp b/td/telegram/SecretChatActor.cpp index 7754e8af7..138b2b88f 100644 --- a/td/telegram/SecretChatActor.cpp +++ b/td/telegram/SecretChatActor.cpp @@ -969,7 +969,7 @@ Status SecretChatActor::do_inbound_message_decrypted_unchecked(unique_ptr<log_ev auto finish_seq_no = static_cast<uint32>(action_resend->end_seq_no_ / 2); if (start_seq_no + MAX_RESEND_COUNT < finish_seq_no) { message->promise.set_value(Unit()); - return Status::Error(PSLICE() << "Won't resend more than " << MAX_RESEND_COUNT << " messages"); + return Status::Error("Can't resend too many messages"); } LOG(INFO) << "ActionResend: " << tag("start", start_seq_no) << tag("finish_seq_no", finish_seq_no); for (auto seq_no = start_seq_no; seq_no <= finish_seq_no; seq_no++) { @@ -2252,6 +2252,4 @@ void SecretChatActor::on_promise_error(Status error, string desc) { LOG(FATAL) << "Failed: " << tag("promise", desc) << error; } -constexpr int32 SecretChatActor::MAX_RESEND_COUNT; - } // namespace td diff --git a/tdnet/td/net/HttpReader.cpp b/tdnet/td/net/HttpReader.cpp index d0a3e02da..aadfb2335 100644 --- a/tdnet/td/net/HttpReader.cpp +++ b/tdnet/td/net/HttpReader.cpp @@ -24,8 +24,6 @@ namespace td { -constexpr const char HttpReader::TEMP_DIRECTORY_PREFIX[]; - void HttpReader::init(ChainBufferReader *input, size_t max_post_size, size_t max_files) { input_ = input; state_ = State::ReadHeaders; diff --git a/test/query_merger.cpp b/test/query_merger.cpp index dc2e254c3..a9559c283 100644 --- a/test/query_merger.cpp +++ b/test/query_merger.cpp @@ -88,10 +88,6 @@ class TestQueryMerger final : public td::Actor { td::FlatHashSet<td::int64> pending_query_ids_; }; -constexpr std::size_t TestQueryMerger::MAX_CONCURRENT_QUERY_COUNT; -constexpr std::size_t TestQueryMerger::MAX_MERGED_QUERY_COUNT; -constexpr std::size_t TestQueryMerger::MAX_QUERY_COUNT; - TEST(QueryMerger, stress) { td::ConcurrentScheduler sched(0, 0); sched.create_actor_unsafe<TestQueryMerger>(0, "TestQueryMerger").release(); |
