NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Apply the new patch from Davis (#2929)

Browse Source
This commit is contained in:
Juha Reunanen 2024-03-10 18:59:49 +02:00 committed by GitHub
parent d5909ed977
commit 1529b690da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlib/threads/threads_kernel_1.h
View File

@ -92,16 +92,22 @@ namespace dlib
void wait (
) const
{
std::unique_lock<std::mutex> cs(m.cs, std::defer_lock);
std::unique_lock<std::mutex> cs(m.cs, std::adopt_lock);
cv.wait(cs);
// Make sure we don't actually modify the mutex. Since the calling code will have locked
// it and it should remain locked.
cs.release();
}
bool wait_or_timeout (
unsigned long milliseconds
) const
{
std::unique_lock<std::mutex> cs(m.cs, std::defer_lock);
std::unique_lock<std::mutex> cs(m.cs, std::adopt_lock);
auto status = cv.wait_until(cs, std::chrono::system_clock::now() + std::chrono::milliseconds(milliseconds));
// Make sure we don't actually modify the mutex. Since the calling code will have locked
// it and it should remain locked.
cs.release();
return status == std::cv_status::no_timeout;
}