diff options
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | src/devpoll.cpp | 6 | ||||
| -rw-r--r-- | src/object.hpp | 2 | ||||
| -rw-r--r-- | src/tcp_socket.cpp | 3 | ||||
| -rw-r--r-- | src/zmq.cpp | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 172b74a..cdca23c 100644 --- a/configure.in +++ b/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( diff --git a/src/devpoll.cpp b/src/devpoll.cpp index b7d153c..ac5c72f 100644 --- a/src/devpoll.cpp +++ b/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) { diff --git a/src/object.hpp b/src/object.hpp index 2e41507..1954071 100644 --- a/src/object.hpp +++ b/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 (); diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp index 782f0d8..7e68e7d 100644 --- a/src/tcp_socket.cpp +++ b/src/tcp_socket.cpp @@ -184,4 +184,5 @@ int zmq::tcp_socket_t::read (void *data, int size) return (size_t) nbytes; } -#endif
\ No newline at end of file +#endif + diff --git a/src/zmq.cpp b/src/zmq.cpp index 63a7b4b..c966448 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -292,4 +292,5 @@ unsigned long zmq_stopwatch_stop (void *watch_) uint64_t start = *(uint64_t*) watch_; free (watch_); return (unsigned long) (end - start); -}
\ No newline at end of file +} + |