diff options
| author | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-12-15 23:50:32 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-12-15 23:50:32 +0100 |
| commit | 7479871cde46371c593f35c0ace3d9e984fddb1a (patch) | |
| tree | 28fce83216cf66f90fa4483cbdcb6395c707b9e9 | |
| parent | 8aa0908635f255e2d533539d5330b92b62dc88ba (diff) | |
| parent | 3e640836674872961f48efb4dc7badb20d736407 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 16 | ||||
| -rw-r--r-- | src/zmq_listener_init.cpp | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index 518c469..30b853a 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -198,6 +198,10 @@ > </File> <File + RelativePath="..\..\..\src\fq.cpp" + > + </File> + <File RelativePath="..\..\..\src\io_object.cpp" > </File> @@ -214,6 +218,10 @@ > </File> <File + RelativePath="..\..\..\src\lb.cpp" + > + </File> + <File RelativePath="..\..\..\src\object.cpp" > </File> @@ -412,6 +420,10 @@ > </File> <File + RelativePath="..\..\..\src\fq.hpp" + > + </File> + <File RelativePath="..\..\..\src\i_endpoint.hpp" > </File> @@ -452,6 +464,10 @@ > </File> <File + RelativePath="..\..\..\src\lb.hpp" + > + </File> + <File RelativePath="..\..\..\src\msg_content.hpp" > </File> diff --git a/src/zmq_listener_init.cpp b/src/zmq_listener_init.cpp index 97ea477..f7b3001 100644 --- a/src/zmq_listener_init.cpp +++ b/src/zmq_listener_init.cpp @@ -121,6 +121,7 @@ class zmq::socket_base_t *zmq::zmq_listener_init_t::get_owner () const char *zmq::zmq_listener_init_t::get_session_name () { zmq_assert (false); + return NULL; } void zmq::zmq_listener_init_t::process_plug () |