From ef5e709ac8de3810edc0fb807dafc8b843ee575d Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 9 Sep 2019 02:04:30 +0300 Subject: [PATCH] Fix clang 3.4 and OpenSSL 0.9.8 CE. GitOrigin-RevId: 9157bfe975bdb376fbd573bd23107c36b1444f34 --- tdnet/CMakeLists.txt | 2 +- tdutils/td/utils/port/detail/ThreadPthread.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tdnet/CMakeLists.txt b/tdnet/CMakeLists.txt index cf7e8c909..bebbe9dd6 100644 --- a/tdnet/CMakeLists.txt +++ b/tdnet/CMakeLists.txt @@ -49,10 +49,10 @@ add_library(tdnet STATIC ${TDNET_SOURCE}) target_include_directories(tdnet PUBLIC $) target_include_directories(tdnet SYSTEM PRIVATE $) target_link_libraries(tdnet PUBLIC tdutils tdactor PRIVATE ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}) -target_link_libraries(tdnet PRIVATE ${OPENSSL_CRYPTO_LIBRARY}) if (NOT EMSCRIPTEN) target_link_libraries(tdnet PRIVATE ${OPENSSL_SSL_LIBRARY}) endif() +target_link_libraries(tdnet PRIVATE ${OPENSSL_CRYPTO_LIBRARY}) if (WIN32) target_link_libraries(tdnet PRIVATE Crypt32) diff --git a/tdutils/td/utils/port/detail/ThreadPthread.h b/tdutils/td/utils/port/detail/ThreadPthread.h index 2d5f82864..3d9677eaa 100644 --- a/tdutils/td/utils/port/detail/ThreadPthread.h +++ b/tdutils/td/utils/port/detail/ThreadPthread.h @@ -31,7 +31,10 @@ class ThreadPthread { ThreadPthread() = default; ThreadPthread(const ThreadPthread &other) = delete; ThreadPthread &operator=(const ThreadPthread &other) = delete; - ThreadPthread(ThreadPthread &&) = default; + ThreadPthread(ThreadPthread &&other) noexcept + : is_inited_(std::move(other.is_inited_)) + , thread_(other.thread_) { + } ThreadPthread &operator=(ThreadPthread &&other) { join(); is_inited_ = std::move(other.is_inited_);