Skip to content

L
libzmq
Commit 963dffb5 authored by Constantin Rack's avatar Constantin Rack
Browse files
Options

Merge pull request #1760 from hintjens/master 

Problem: not building on VS2015
parents c6b11ae4 b92055fa
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 17 deletions
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View file @ 963dffb5
......@@ -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" />
......
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View file @ 963dffb5
......@@ -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" />
......
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View file @ 963dffb5
......@@ -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" />
......
builds/msvc/vs2015/libzmq/libzmq.vcxproj
View file @ 963dffb5
......@@ -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" />
......
src/timers.cpp
View file @ 963dffb5
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment