summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-08-24 15:58:48 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-08-25 15:39:21 +0200
commitb608c19c5a28f0f49a106bfddf680f0a410df6c8 (patch)
treeb6abff37a109422752d887c6c1bc5e87d869e788 /src
parent9b8993efb48ccbe3df917338cc078129b5af495b (diff)
MSVC build fixed
Diffstat (limited to 'src')
-rw-r--r--src/pipe.hpp9
-rw-r--r--src/socket_base.cpp1
2 files changed, 6 insertions, 4 deletions
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_)