diff options
| author | unknown <bundra@.(none)> | 2009-12-28 16:20:21 +0100 |
|---|---|---|
| committer | unknown <bundra@.(none)> | 2009-12-28 16:20:21 +0100 |
| commit | c97967ed4b70de700db38cc2661bbe43262bc029 (patch) | |
| tree | 7bb948c242f52ca30969eec75a2d24a255b62431 | |
| parent | 5852db451a76905336601c5ba3e4f33006f007fb (diff) | |
MSVC build fixed
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 16 | ||||
| -rw-r--r-- | src/zmq_init.cpp | 1 |
2 files changed, 5 insertions, 12 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index 30b853a..30de948 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -330,10 +330,6 @@ > </File> <File - RelativePath="..\..\..\src\zmq_connecter_init.cpp" - > - </File> - <File RelativePath="..\..\..\src\zmq_decoder.cpp" > </File> @@ -346,11 +342,11 @@ > </File> <File - RelativePath="..\..\..\src\zmq_listener.cpp" + RelativePath="..\..\..\src\zmq_init.cpp" > </File> <File - RelativePath="..\..\..\src\zmq_listener_init.cpp" + RelativePath="..\..\..\src\zmq_listener.cpp" > </File> </Filter> @@ -608,10 +604,6 @@ > </File> <File - RelativePath="..\..\..\src\zmq_connecter_init.hpp" - > - </File> - <File RelativePath="..\..\..\src\zmq_decoder.hpp" > </File> @@ -624,11 +616,11 @@ > </File> <File - RelativePath="..\..\..\src\zmq_listener.hpp" + RelativePath="..\..\..\src\zmq_init.hpp" > </File> <File - RelativePath="..\..\..\src\zmq_listener_init.hpp" + RelativePath="..\..\..\src\zmq_listener.hpp" > </File> </Filter> diff --git a/src/zmq_init.cpp b/src/zmq_init.cpp index e526b34..416e733 100644 --- a/src/zmq_init.cpp +++ b/src/zmq_init.cpp @@ -119,6 +119,7 @@ class zmq::socket_base_t *zmq::zmq_init_t::get_owner () uint64_t zmq::zmq_init_t::get_ordinal () { zmq_assert (false); + return 0; } void zmq::zmq_init_t::process_plug () |