From b608c19c5a28f0f49a106bfddf680f0a410df6c8 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 24 Aug 2010 15:58:48 +0200 Subject: MSVC build fixed --- src/pipe.hpp | 9 +++++---- src/socket_base.cpp | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/pipe.hpp b/src/pipe.hpp index 12b0dfe..421ebc9 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -32,6 +32,11 @@ namespace zmq { + // Creates a pipe. Returns pointer to reader and writer objects. + void create_pipe (object_t *reader_parent_, object_t *writer_parent_, + uint64_t hwm_, int64_t swap_size_, class reader_t **reader_, + class writer_t **writer_); + // The shutdown mechanism for pipe works as follows: Either endpoint // (or even both of them) can ask pipe to terminate by calling 'terminate' // method. Pipe then terminates in asynchronous manner. When the part of @@ -197,10 +202,6 @@ namespace zmq void operator = (const writer_t&); }; - // Creates a pipe. Returns pointer to reader and writer objects. - void create_pipe (object_t *reader_parent_, object_t *writer_parent_, - uint64_t hwm_, int64_t swap_size_, reader_t **reader_, - writer_t **writer_); } #endif diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 76dfc46..f575c0a 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -307,6 +307,7 @@ int zmq::socket_base_t::bind (const char *addr_) } zmq_assert (false); + return -1; } int zmq::socket_base_t::connect (const char *addr_) -- cgit v1.2.3