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

fix for pre-c++11 compilers

Browse Source
This commit is contained in:
Alex Fabijanic 2018-09-04 20:14:18 +02:00
parent f140808fab
commit b42900ee5b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Net/include/Poco/Net/SocketImpl.h
View File

@ -490,7 +490,7 @@ protected:
void reset(poco_socket_t fd = POCO_INVALID_SOCKET); void reset(poco_socket_t fd = POCO_INVALID_SOCKET);
/// Allows subclasses to set the socket manually, iff no valid socket is set yet. /// Allows subclasses to set the socket manually, iff no valid socket is set yet.
void checkBrokenTimeout(const SelectMode& mode); void checkBrokenTimeout(SelectMode mode);
static int lastError(); static int lastError();
/// Returns the last error code. /// Returns the last error code.

4
Net/src/SocketImpl.cpp
View File

@ -306,11 +306,11 @@ void SocketImpl::shutdown()
} }
void SocketImpl::checkBrokenTimeout(const SelectMode& mode) void SocketImpl::checkBrokenTimeout(SelectMode mode)
{ {
if (_isBrokenTimeout) if (_isBrokenTimeout)
{ {
Poco::Timespan timeout = (mode == SelectMode::SELECT_READ) ? _recvTimeout : _sndTimeout; Poco::Timespan timeout = (mode == SELECT_READ) ? _recvTimeout : _sndTimeout;
if (timeout.totalMicroseconds() != 0) if (timeout.totalMicroseconds() != 0)
{ {
if (!poll(timeout, mode)) if (!poll(timeout, mode))

2
openssl

@ -1 +1 @@
Subproject commit 0c6d16ec85f80ea3ce05a8f2ff52c1b3ba240a41 Subproject commit 26b1673caad94a702b6d694f48f917a283b30777