mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-13 10:52:56 +01:00
Merge pull request #1735 from hintjens/master
Problem: radio/dish class broke Windows builds
This commit is contained in:
commit
a2b9d826e4
@ -105,6 +105,7 @@
|
|||||||
<File RelativePath="..\..\..\..\src\ctx.cpp" />
|
<File RelativePath="..\..\..\..\src\ctx.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\dealer.cpp" />
|
<File RelativePath="..\..\..\..\src\dealer.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\devpoll.cpp" />
|
<File RelativePath="..\..\..\..\src\devpoll.cpp" />
|
||||||
|
<File RelativePath="..\..\..\..\src\dish.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\dist.cpp" />
|
<File RelativePath="..\..\..\..\src\dist.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\epoll.cpp" />
|
<File RelativePath="..\..\..\..\src\epoll.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\err.cpp" />
|
<File RelativePath="..\..\..\..\src\err.cpp" />
|
||||||
@ -140,6 +141,7 @@
|
|||||||
<File RelativePath="..\..\..\..\src\pub.cpp" />
|
<File RelativePath="..\..\..\..\src\pub.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\pull.cpp" />
|
<File RelativePath="..\..\..\..\src\pull.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\push.cpp" />
|
<File RelativePath="..\..\..\..\src\push.cpp" />
|
||||||
|
<File RelativePath="..\..\..\..\src\radio.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\random.cpp" />
|
<File RelativePath="..\..\..\..\src\random.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\raw_decoder.cpp" />
|
<File RelativePath="..\..\..\..\src\raw_decoder.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\raw_encoder.cpp" />
|
<File RelativePath="..\..\..\..\src\raw_encoder.cpp" />
|
||||||
@ -182,6 +184,7 @@
|
|||||||
<File RelativePath="..\..\..\..\src\ctx.hpp" />
|
<File RelativePath="..\..\..\..\src\ctx.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\decoder.hpp" />
|
<File RelativePath="..\..\..\..\src\decoder.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\devpoll.hpp" />
|
<File RelativePath="..\..\..\..\src\devpoll.hpp" />
|
||||||
|
<File RelativePath="..\..\..\..\src\dish.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\dist.hpp" />
|
<File RelativePath="..\..\..\..\src\dist.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\encoder.hpp" />
|
<File RelativePath="..\..\..\..\src\encoder.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\epoll.hpp" />
|
<File RelativePath="..\..\..\..\src\epoll.hpp" />
|
||||||
@ -225,6 +228,7 @@
|
|||||||
<File RelativePath="..\..\..\..\src\pub.hpp" />
|
<File RelativePath="..\..\..\..\src\pub.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\pull.hpp" />
|
<File RelativePath="..\..\..\..\src\pull.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\push.hpp" />
|
<File RelativePath="..\..\..\..\src\push.hpp" />
|
||||||
|
<File RelativePath="..\..\..\..\src\radio.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\random.hpp" />
|
<File RelativePath="..\..\..\..\src\random.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\raw_decoder.hpp" />
|
<File RelativePath="..\..\..\..\src\raw_decoder.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\raw_encoder.hpp" />
|
<File RelativePath="..\..\..\..\src\raw_encoder.hpp" />
|
||||||
|
@ -84,6 +84,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\dish.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
||||||
@ -129,6 +130,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\radio.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
||||||
@ -172,6 +174,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\dish.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
||||||
@ -211,6 +214,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\radio.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
||||||
|
@ -84,6 +84,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\dish.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
||||||
@ -129,6 +130,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\radio.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
||||||
@ -172,6 +174,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\dish.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
||||||
@ -211,6 +214,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\radio.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
||||||
|
@ -84,6 +84,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\dish.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
||||||
@ -129,6 +130,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\radio.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
||||||
@ -172,6 +174,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\dish.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
||||||
@ -211,6 +214,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\radio.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
||||||
|
@ -84,6 +84,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\dish.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
<ClInclude Include="..\..\..\..\src\dist.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
<ClInclude Include="..\..\..\..\src\epoll.hpp" />
|
||||||
@ -129,6 +130,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
<ClInclude Include="..\..\..\..\src\pub.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
<ClInclude Include="..\..\..\..\src\pull.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
<ClInclude Include="..\..\..\..\src\push.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\radio.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
<ClInclude Include="..\..\..\..\src\random.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
|
||||||
@ -172,6 +174,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\dish.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
<ClCompile Include="..\..\..\..\src\dist.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
<ClCompile Include="..\..\..\..\src\err.cpp" />
|
||||||
@ -211,6 +214,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
<ClCompile Include="..\..\..\..\src\pub.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
<ClCompile Include="..\..\..\..\src\pull.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
<ClCompile Include="..\..\..\..\src\push.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\radio.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
<ClCompile Include="..\..\..\..\src\random.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
|
||||||
|
Loading…
Reference in New Issue
Block a user