strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make this file compile for iOS

Browse source
This commit is contained in:
Tor Lillqvist 2018-08-29 18:48:13 +03:00 committed by Tor Lillqvist
parent 39072dbae5
commit d07f686b28
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/Socket.hpp
View file

@ -33,10 +33,10 @@
#include <thread>
#include <atomic>
#include "common/Common.hpp"
#include "common/Log.hpp"
#include "common/Util.hpp"
#include "common/SigUtil.hpp"
#include "Common.hpp"
#include "Log.hpp"
#include "Util.hpp"
#include "SigUtil.hpp"
namespace Poco
{
@ -262,8 +262,8 @@ public:
{
if (InhibitThreadChecks)
return;
// 0 owner means detached and can be invoked by any thread.
const bool sameThread = (_owner == std::thread::id(0) || std::this_thread::get_id() == _owner);
// uninitialized owner means detached and can be invoked by any thread.
const bool sameThread = (_owner == std::thread::id() || std::this_thread::get_id() == _owner);
if (!sameThread)
LOG_ERR("#" << _fd << " Invoked from foreign thread. Expected: " <<
Log::to_string(_owner) << " but called from " <<
@ -384,7 +384,7 @@ public:
LOG_DBG("Removing socket #" << socket->getFD() << " from " << _name);
socket->assertCorrectThread();
socket->setThreadOwner(std::thread::id(0));
socket->setThreadOwner(std::thread::id());
_pollSockets.pop_back();
}
@ -416,8 +416,8 @@ public:
{
if (InhibitThreadChecks)
return;
// 0 owner means detached and can be invoked by any thread.
const bool sameThread = (!isAlive() || _owner == std::thread::id(0) || std::this_thread::get_id() == _owner);
// uninitialized owner means detached and can be invoked by any thread.
const bool sameThread = (!isAlive() || _owner == std::thread::id() || std::this_thread::get_id() == _owner);
if (!sameThread)
LOG_ERR("Incorrect thread affinity for " << _name << ". Expected: " <<
Log::to_string(_owner) << " (" << Util::getThreadId() <<
@ -564,7 +564,7 @@ public:
std::lock_guard<std::mutex> lock(_mutex);
LOG_DBG("Inserting socket #" << newSocket->getFD() << " into " << _name);
// sockets in transit are un-owned.
newSocket->setThreadOwner(std::thread::id(0));
newSocket->setThreadOwner(std::thread::id());
_newSockets.emplace_back(newSocket);
wakeup();
}