From a016d13c15fb74cdf792478f9150321d98d0f748 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 23 Nov 2022 23:43:05 +0300 Subject: [PATCH] Use td::Hash instead of std::hash. --- telegram-bot-api/Client.h | 8 ++++---- telegram-bot-api/WebhookActor.cpp | 2 -- telegram-bot-api/WebhookActor.h | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h index 5249719..6cf8612 100644 --- a/telegram-bot-api/Client.h +++ b/telegram-bot-api/Client.h @@ -22,13 +22,13 @@ #include "td/utils/Container.h" #include "td/utils/FlatHashMap.h" #include "td/utils/FlatHashSet.h" +#include "td/utils/HashTableUtils.h" #include "td/utils/JsonBuilder.h" #include "td/utils/Promise.h" #include "td/utils/Slice.h" #include "td/utils/Status.h" #include "td/utils/WaitFreeHashMap.h" -#include #include #include #include @@ -836,9 +836,9 @@ class Client final : public WebhookActor::Callback { }; struct FullMessageIdHash { - std::size_t operator()(FullMessageId full_message_id) const { - return std::hash()(full_message_id.chat_id) * 2023654985u + - std::hash()(full_message_id.message_id); + td::uint32 operator()(FullMessageId full_message_id) const { + return td::Hash()(full_message_id.chat_id) * 2023654985u + + td::Hash()(full_message_id.message_id); } }; diff --git a/telegram-bot-api/WebhookActor.cpp b/telegram-bot-api/WebhookActor.cpp index fbcaf58..89f30a5 100644 --- a/telegram-bot-api/WebhookActor.cpp +++ b/telegram-bot-api/WebhookActor.cpp @@ -31,8 +31,6 @@ #include "td/utils/Span.h" #include "td/utils/Time.h" -#include - namespace telegram_bot_api { static int VERBOSITY_NAME(webhook) = VERBOSITY_NAME(DEBUG); diff --git a/telegram-bot-api/WebhookActor.h b/telegram-bot-api/WebhookActor.h index 462384f..2f68fbe 100644 --- a/telegram-bot-api/WebhookActor.h +++ b/telegram-bot-api/WebhookActor.h @@ -22,6 +22,7 @@ #include "td/utils/Container.h" #include "td/utils/FlatHashMap.h" #include "td/utils/FloodControlFast.h" +#include "td/utils/HashTableUtils.h" #include "td/utils/HttpUrl.h" #include "td/utils/JsonBuilder.h" #include "td/utils/List.h" @@ -32,7 +33,6 @@ #include "td/utils/VectorQueue.h" #include -#include #include #include #include @@ -123,8 +123,8 @@ class WebhookActor final : public td::HttpOutboundConnection::Callback { td::TQueue::EventId tqueue_offset_; std::size_t max_loaded_updates_ = 0; struct EventIdHash { - std::size_t operator()(td::TQueue::EventId event_id) const { - return std::hash()(event_id.value()); + td::uint32 operator()(td::TQueue::EventId event_id) const { + return td::Hash()(event_id.value()); } }; td::FlatHashMap, EventIdHash> update_map_;