Merge branch 'master' into basic-touch

This commit is contained in:
Simon Fels 2018-02-05 07:46:35 +02:00 • committed by GitHub
commit 460f1f4da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -138,7 +138,7 @@ unsigned short BaseSocketMessenger<stream_protocol>::local_port() const {
template <typename stream_protocol>
void BaseSocketMessenger<stream_protocol>::set_no_delay() {
const auto fd = socket->native();
const auto fd = socket->native_handle();
int flag = 1;
const auto ret =
::setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,