tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix CxCli and find_library.

Browse Source 
GitOrigin-RevId: b3057195dc88b31fc87a1688f470d03e921df99f
This commit is contained in:
levlam 2018-02-22 18:44:22 +03:00
parent d1f1a14a37
commit 35d0ac2985
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tdutils/CMakeLists.txt
View File

@ -210,7 +210,9 @@ set(TDUTILS_TEST_SOURCE
#LIBRARIES #LIBRARIES
add_library(tdutils STATIC ${TDUTILS_SOURCE}) add_library(tdutils STATIC ${TDUTILS_SOURCE})
if (WIN32) if (WIN32)
target_link_libraries(tdutils PRIVATE ws2_32 Mswsock) find_library(WS2_32_LIBRARY ws2_32)
find_library(MSWSOCK_LIBRARY Mswsock)
target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
endif() endif()
if (NOT CMAKE_CROSSCOMPILING) if (NOT CMAKE_CROSSCOMPILING)
add_dependencies(tdutils tdmime_auto) add_dependencies(tdutils tdmime_auto)

2
tdutils/td/utils/port/CxCli.h
View File

@ -49,7 +49,7 @@ public:
value = it->second; value = it->second;
return true; return true;
} }
void Remove(Key key, Value &value) { void TryRemove(Key key, Value &value) {
std::lock_guard<std::mutex> guard(mutex_); std::lock_guard<std::mutex> guard(mutex_);
impl_.erase(key); impl_.erase(key);
} }