From 311cd72febb8ae955c77821ce2e27f160ae35d15 Mon Sep 17 00:00:00 2001 From: levlam Date: Thu, 24 Jan 2019 20:21:00 +0300 Subject: [PATCH] enum class for ResolveType. GitOrigin-RevId: 3cb46ab9c1c6913364748136722d2e8485cc6008 --- tdnet/td/net/GetHostByNameActor.cpp | 9 +++++---- tdnet/td/net/GetHostByNameActor.h | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tdnet/td/net/GetHostByNameActor.cpp b/tdnet/td/net/GetHostByNameActor.cpp index ecc34222..5ca702d5 100644 --- a/tdnet/td/net/GetHostByNameActor.cpp +++ b/tdnet/td/net/GetHostByNameActor.cpp @@ -100,7 +100,8 @@ class DnsResolver : public Actor { Promise promise_; ActorOwn<> query_; size_t pos_ = 0; - GetHostByNameActor::ResolveType types[2] = {GetHostByNameActor::Google, GetHostByNameActor::Native}; + GetHostByNameActor::ResolveType types[2] = {GetHostByNameActor::ResolveType::Google, + GetHostByNameActor::ResolveType::Native}; void loop() override { if (!query_.empty()) { @@ -133,13 +134,13 @@ GetHostByNameActor::Options::Options() = default; ActorOwn<> GetHostByNameActor::resolve(std::string host, ResolveOptions options, Promise promise) { switch (options.type) { - case Native: + case ResolveType::Native: return ActorOwn<>(create_actor_on_scheduler( "NativeDnsResolver", options.scheduler_id, std::move(host), options, std::move(promise))); - case Google: + case ResolveType::Google: return ActorOwn<>(create_actor_on_scheduler( "GoogleDnsResolver", options.scheduler_id, std::move(host), options, std::move(promise))); - case All: + case ResolveType::All: return ActorOwn<>(create_actor_on_scheduler("DnsResolver", options.scheduler_id, std::move(host), options, std::move(promise))); default: diff --git a/tdnet/td/net/GetHostByNameActor.h b/tdnet/td/net/GetHostByNameActor.h index c84a61f1..161ab21d 100644 --- a/tdnet/td/net/GetHostByNameActor.h +++ b/tdnet/td/net/GetHostByNameActor.h @@ -18,10 +18,10 @@ namespace td { class GetHostByNameActor final : public Actor { public: - enum ResolveType { Native, Google, All }; + enum class ResolveType { Native, Google, All }; struct Options { Options(); - ResolveType type{Native}; + ResolveType type{ResolveType::Native}; int scheduler_id{-1}; int32 ok_timeout{CACHE_TIME}; int32 error_timeout{ERROR_CACHE_TIME}; @@ -30,7 +30,7 @@ class GetHostByNameActor final : public Actor { void run(std::string host, int port, bool prefer_ipv6, Promise promise); struct ResolveOptions { - ResolveType type{Native}; + ResolveType type{ResolveType::Native}; bool prefer_ipv6{false}; int scheduler_id{-1}; };