summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builds/msvc/libzmq/libzmq.vcproj16
-rw-r--r--src/zmq_init.cpp1
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 ()