minor changes

src/xdealer_channel.cpp

@@ -7,6 +7,8 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
+#include "xeus-zmq/xmiddleware.hpp"
+
 #include "xdealer_channel.hpp"
 
 namespace xeus
@@ -35,8 +37,8 @@ namespace xeus
     std::optional<zmq::multipart_t> xdealer_channel::receive_message(long timeout)
     {
         zmq::multipart_t wire_msg;
-        m_socket.setsockopt(ZMQ_RCVTIMEO, timeout);
-        if (wire_msg.recv(m_socket, zmq::recv_flags::none))
+        m_socket.set(zmq::sockopt::linger, timeout);
+        if (wire_msg.recv(m_socket))
         {
             return wire_msg;
         } else {

src/xiopub_client.cpp

@@ -7,7 +7,10 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
+#include <iostream>
+
 #include "xiopub_client.hpp"
+#include "xclient_zmq_impl.hpp"
 
 #include "xeus-zmq/xzmq_serializer.hpp"
 
@@ -40,7 +43,7 @@ namespace xeus
         std::lock_guard<std::mutex> guard(m_queue_mutex);
         if (!m_message_queue.empty())
         {
-            xmessage msg = m_message_queue.back();
+            xmessage msg = std::move(m_message_queue.back());
             m_message_queue.pop();
             return msg;
         } else {
@@ -67,7 +70,7 @@ namespace xeus
                     xmessage msg = p_client_impl->deserialize(wire_msg);
                     {
                         std::lock_guard<std::mutex> guard(m_queue_mutex);
-                        m_message_queue.push(msg);
+                        m_message_queue.push(std::move(msg));
                     }
                     p_client_impl->notify_shell_listener(std::move(msg));
                 }

src/xiopub_client.hpp

@@ -16,10 +16,12 @@
 #include "zmq.hpp"
 #include "nlohmann/json.hpp"
 
+#include "xeus/xmessage.hpp"
 #include "xeus/xeus_context.hpp"
 #include "xeus/xkernel_configuration.hpp"
 
 #include "xeus-zmq/xthread.hpp"
+#include "xeus-zmq/xmiddleware.hpp"
 
 namespace xeus
 {