diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-08-24 15:58:48 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-08-25 15:39:21 +0200 |
| commit | b608c19c5a28f0f49a106bfddf680f0a410df6c8 (patch) | |
| tree | b6abff37a109422752d887c6c1bc5e87d869e788 | |
| parent | 9b8993efb48ccbe3df917338cc078129b5af495b (diff) | |
MSVC build fixed
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 52 | ||||
| -rw-r--r-- | src/pipe.hpp | 9 | ||||
| -rw-r--r-- | src/socket_base.cpp | 1 |
3 files changed, 40 insertions, 22 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index 95db1df..6dea77c 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -170,11 +170,11 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\src\app_thread.cpp" + RelativePath="..\..\..\src\command.cpp" > </File> <File - RelativePath="..\..\..\src\command.cpp" + RelativePath="..\..\..\src\connect_session.cpp" > </File> <File @@ -186,10 +186,6 @@ > </File> <File - RelativePath="..\..\..\src\push.cpp" - > - </File> - <File RelativePath="..\..\..\src\epoll.cpp" > </File> @@ -230,6 +226,10 @@ > </File> <File + RelativePath="..\..\..\src\named_session.cpp" + > + </File> + <File RelativePath="..\..\..\src\object.cpp" > </File> @@ -238,7 +238,7 @@ > </File> <File - RelativePath="..\..\..\src\owned.cpp" + RelativePath="..\..\..\src\own.cpp" > </File> <File @@ -274,6 +274,14 @@ > </File> <File + RelativePath="..\..\..\src\pull.cpp" + > + </File> + <File + RelativePath="..\..\..\src\push.cpp" + > + </File> + <File RelativePath="..\..\..\src\queue.cpp" > </File> @@ -326,7 +334,7 @@ > </File> <File - RelativePath="..\..\..\src\pull.cpp" + RelativePath="..\..\..\src\transient_session.cpp" > </File> <File @@ -376,10 +384,6 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File - RelativePath="..\..\..\src\app_thread.hpp" - > - </File> - <File RelativePath="..\..\..\src\atomic_counter.hpp" > </File> @@ -396,19 +400,19 @@ > </File> <File - RelativePath="..\..\..\src\ctx.hpp" + RelativePath="..\..\..\src\connect_session.hpp" > </File> <File - RelativePath="..\..\..\src\decoder.hpp" + RelativePath="..\..\..\src\ctx.hpp" > </File> <File - RelativePath="..\..\..\src\devpoll.hpp" + RelativePath="..\..\..\src\decoder.hpp" > </File> <File - RelativePath="..\..\..\src\push.hpp" + RelativePath="..\..\..\src\devpoll.hpp" > </File> <File @@ -484,6 +488,10 @@ > </File> <File + RelativePath="..\..\..\src\named_session.hpp" + > + </File> + <File RelativePath="..\..\..\src\object.hpp" > </File> @@ -492,7 +500,7 @@ > </File> <File - RelativePath="..\..\..\src\owned.hpp" + RelativePath="..\..\..\src\own.hpp" > </File> <File @@ -532,6 +540,14 @@ > </File> <File + RelativePath="..\..\..\src\pull.hpp" + > + </File> + <File + RelativePath="..\..\..\src\push.hpp" + > + </File> + <File RelativePath="..\..\..\src\queue.hpp" > </File> @@ -588,7 +604,7 @@ > </File> <File - RelativePath="..\..\..\src\pull.hpp" + RelativePath="..\..\..\src\transient_session.hpp" > </File> <File 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_) |