mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-13 10:52:56 +01:00
Problem: not building on VS2015
Solution: fixed project files, and warning in timers.cpp
This commit is contained in:
parent
c6b11ae4a7
commit
b92055fa56
@ -151,11 +151,11 @@
|
||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\timers.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\windows.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\wire.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
|
||||
@ -241,12 +241,12 @@
|
||||
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\timers.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
|
||||
|
@ -151,11 +151,11 @@
|
||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\timers.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\windows.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\wire.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
|
||||
@ -241,12 +241,12 @@
|
||||
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\timers.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
|
||||
|
@ -151,11 +151,11 @@
|
||||
<ClInclude Include="..\..\..\..\src\timers.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\windows.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\wire.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
|
||||
@ -241,12 +241,12 @@
|
||||
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\timers.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
|
||||
|
@ -159,11 +159,11 @@
|
||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\timers.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\windows.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\wire.hpp" />
|
||||
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
|
||||
@ -255,8 +255,6 @@
|
||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
|
||||
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
|
||||
|
@ -117,7 +117,7 @@ long zmq::timers_t::timeout ()
|
||||
// Live timer, lets return the timeout
|
||||
if (cancelled_it == cancelled_timers.end ()) {
|
||||
if (it->first > now)
|
||||
return it->first - now;
|
||||
return (long) (it->first - now);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user