From 803602c4d11239ba00c260c3c2d3e5797ed70cd7 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 15 Oct 2018 11:23:51 +0300 Subject: [PATCH] Make tdnet dependency on OpenSSL private. GitOrigin-RevId: 76331149d0d1e77ed0c4a3505ffe3568d98c0c01 --- tdnet/CMakeLists.txt | 4 ++-- tdnet/td/net/GetHostByNameActor.h | 2 ++ tdnet/td/net/SslStream.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tdnet/CMakeLists.txt b/tdnet/CMakeLists.txt index 0f325a6eb..ab81cecd3 100644 --- a/tdnet/CMakeLists.txt +++ b/tdnet/CMakeLists.txt @@ -47,8 +47,8 @@ set(TDNET_SOURCE add_library(tdnet STATIC ${TDNET_SOURCE}) target_include_directories(tdnet PUBLIC $) -target_include_directories(tdnet SYSTEM PUBLIC $) -target_link_libraries(tdnet PUBLIC tdutils tdactor ${OPENSSL_LIBRARIES} PRIVATE ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}) +target_include_directories(tdnet SYSTEM PRIVATE $) +target_link_libraries(tdnet PUBLIC tdutils tdactor PRIVATE ${CMAKE_DL_LIBS} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES}) if (WIN32) target_link_libraries(tdnet PRIVATE Crypt32) diff --git a/tdnet/td/net/GetHostByNameActor.h b/tdnet/td/net/GetHostByNameActor.h index cdd6af476..fe984c942 100644 --- a/tdnet/td/net/GetHostByNameActor.h +++ b/tdnet/td/net/GetHostByNameActor.h @@ -15,6 +15,7 @@ #include namespace td { + class GetHostByNameActor final : public td::Actor { public: explicit GetHostByNameActor(int32 ok_timeout = CACHE_TIME, int32 error_timeout = ERROR_CACHE_TIME); @@ -37,4 +38,5 @@ class GetHostByNameActor final : public td::Actor { Result load_ip(string host, int port, bool prefer_ipv6) TD_WARN_UNUSED_RESULT; }; + } // namespace td diff --git a/tdnet/td/net/SslStream.h b/tdnet/td/net/SslStream.h index 0d2eb89e7..1562dba65 100644 --- a/tdnet/td/net/SslStream.h +++ b/tdnet/td/net/SslStream.h @@ -34,7 +34,7 @@ class SslStream { size_t flow_write(Slice slice); explicit operator bool() const { - return bool(impl_); + return static_cast(impl_); } private: