Merge branch 'master' of git@github.com:sustrik/zeromq2

configure.in

@@ -48,6 +48,7 @@ case "${host_os}" in
         AC_CHECK_LIB(socket, main)
         AC_CHECK_LIB(nsl, main)
         AC_CHECK_LIB(rt, main)
+        AC_CHECK_LIB(uuid, main)
         CPPFLAGS="-D_REENTRANT -D_PTHREADS $CPPFLAGS"
         AC_MSG_CHECKING([wheter atomic operations can be used])
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM(

src/devpoll.cpp

@@ -30,10 +30,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <limits.h>
+#include <algorithm>
 
 #include "devpoll.hpp"
 #include "err.hpp"
 #include "config.hpp"
+#include "i_poll_events.hpp"
 
 zmq::devpoll_t::devpoll_t ()
 {
@@ -156,11 +158,11 @@ void zmq::devpoll_t::stop ()
     stopping = true;
 }
 
-bool zmq::devpoll_t::loop ()
+void zmq::devpoll_t::loop ()
 {
     //  According to the poll(7d) man page, we can retrieve
     //  no more then (OPEN_MAX - 1) events.
-    int nfds = std::min (max_io_events, OPEN_MAX - 1);
+    int nfds = std::min ((int) max_io_events, OPEN_MAX - 1);
 
     while (!stopping) {
 

src/object.hpp

@@ -37,7 +37,7 @@ namespace zmq
 
         object_t (class dispatcher_t *dispatcher_, int thread_slot_);
         object_t (object_t *parent_);
-        ~object_t ();
+        virtual ~object_t ();
 
         int get_thread_slot ();
         dispatcher_t *get_dispatcher ();

src/tcp_socket.cpp

@@ -185,3 +185,4 @@ int zmq::tcp_socket_t::read (void *data, int size)
 }
 
 #endif
+

src/zmq.cpp

@@ -293,3 +293,4 @@ unsigned long zmq_stopwatch_stop (void *watch_)
     free (watch_);
     return (unsigned long) (end - start);
 }
+