2 files changed, 17 insertions, 0 deletions
diff --git a/include/zmq.h b/include/zmq.h
index a1fcf31..3d641ef 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -225,6 +225,16 @@ ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
 ZMQ_EXPORT int zmq_errno ();
 
 ////////////////////////////////////////////////////////////////////////////////
+//  Devices - Experimental
+////////////////////////////////////////////////////////////////////////////////
+
+#define ZMQ_STREAMER 1
+#define ZMQ_FORWARDER 2
+#define ZMQ_QUEUE 3
+
+ZMQ_EXPORT int zmq_device (int device, void * insocket, void* outsocket);
+
+////////////////////////////////////////////////////////////////////////////////
 //  Helper functions.
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/zmq.hpp b/include/zmq.hpp
index 6228133..63d2835 100644
--- a/include/zmq.hpp
+++ b/include/zmq.hpp
@@ -56,6 +56,13 @@ namespace zmq
         return rc;
     }
 
+    inline void device (int device_, void * insocket_, void* outsocket_)
+    {
+        int rc = zmq_device (device_, insocket_, outsocket_);
+        if (rc != 0)
+            throw error_t ();
+    }
+
     class message_t : private zmq_msg_t
     {
         friend class socket_t;