diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-05 15:00:09 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-05 15:00:09 +0100 |
commit | 5c12d5b387e07203be79df7e4d526d124a53ad8a (patch) | |
tree | f5dde68268449c0d6b222df17aaafc99f33e586a /src/dabOutput | |
parent | 3fa21bd39d9b9cb1b0b8d71e2cc98eebb98ad871 (diff) | |
download | dabmux-5c12d5b387e07203be79df7e4d526d124a53ad8a.tar.gz dabmux-5c12d5b387e07203be79df7e4d526d124a53ad8a.tar.bz2 dabmux-5c12d5b387e07203be79df7e4d526d124a53ad8a.zip |
Do not use boost::optional for TcpSocket
Older boost versions require T to be copy-constructable in optional<T>. This
is not the case for TcpSocket, which is only move-constructable.
Fixes compilation on debian jessie
Diffstat (limited to 'src/dabOutput')
-rw-r--r-- | src/dabOutput/dabOutputTcp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dabOutput/dabOutputTcp.cpp b/src/dabOutput/dabOutputTcp.cpp index 94d379e..975fdff 100644 --- a/src/dabOutput/dabOutputTcp.cpp +++ b/src/dabOutput/dabOutputTcp.cpp @@ -133,9 +133,9 @@ class TCPDataDispatcher while (m_running) { // Add a new TCPConnection to the list, constructing it from the client socket - auto optional_sock = m_listener_socket.accept(timeout_ms); - if (optional_sock) { - m_connections.emplace(m_connections.begin(), std::move(*optional_sock)); + auto sock = m_listener_socket.accept(timeout_ms); + if (sock.isValid()) { + m_connections.emplace(m_connections.begin(), move(sock)); } } } |