diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-05-10 16:45:01 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-05-10 17:37:59 +0100 |
| commit | 638fb0316d7e41e842ca54c04815f0484c569c36 (patch) | |
| tree | cca247b672c46d661d5b109ddbf762594adc443f /net | |
| parent | tests: re-factor PNG save to allow easy re-use elsewhere. (diff) | |
| download | online-638fb0316d7e41e842ca54c04815f0484c569c36.tar.gz online-638fb0316d7e41e842ca54c04815f0484c569c36.zip | |
unipoll: restore missing asserts & some cleanup.
Change-Id: I4277b5e044ead54d91bc834ea05bec649a608678
Diffstat (limited to 'net')
| -rw-r--r-- | net/Socket.cpp | 2 | ||||
| -rw-r--r-- | net/Socket.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/Socket.cpp b/net/Socket.cpp index 0f2a683462..fb7e701ee0 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -376,7 +376,7 @@ void ServerSocket::dumpState(std::ostream& os) void SocketDisposition::execute() { // We should have hard ownership of this socket. - // assert(_socket->getThreadOwner() == std::this_thread::get_id()); + assert(_socket->getThreadOwner() == std::this_thread::get_id()); if (_socketMove) { // Drop pretentions of ownership before _socketMove. diff --git a/net/Socket.hpp b/net/Socket.hpp index ded4098045..c7712339e1 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -470,7 +470,7 @@ public: Log::to_string(_owner) << " (" << Util::getThreadId() << ") but called from " << std::this_thread::get_id() << ", stop: " << _stop); - // assert(_stop || sameThread); + assert(_stop || sameThread); } /// Poll the sockets for available data to read or buffer to write. |