generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 18:20:26 +01:00
Code Issues Projects Releases Wiki Activity

fix(TZInfo): Static FastMutex fails to lock when issued from another thread on linux #3918

Browse Source
This commit is contained in:
Alex Fabijanic 2023-01-23 08:06:55 +01:00
parent 091c1af26a
commit feee864950
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Foundation/src/Timezone_UNIX.cpp
View File

@ -14,7 +14,7 @@
#include "Poco/Timezone.h" #include "Poco/Timezone.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include "Poco/Mutex.h" #include <mutex>
#include <ctime> #include <ctime>
@ -31,7 +31,7 @@ public:
int timeZone() int timeZone()
{ {
Poco::FastMutex::ScopedLock lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || POCO_OS == POCO_OS_ANDROID // no timezone global var #if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || POCO_OS == POCO_OS_ANDROID // no timezone global var
std::time_t now = std::time(NULL); std::time_t now = std::time(NULL);
@ -50,14 +50,14 @@ public:
const char* name(bool dst) const char* name(bool dst)
{ {
Poco::FastMutex::ScopedLock lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
tzset(); tzset();
return tzname[dst ? 1 : 0]; return tzname[dst ? 1 : 0];
} }
private: private:
Poco::FastMutex _mutex; std::mutex _mutex;
}; };