Skip to content

L
libzmq
Commit 6665bffe authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Problem: MSVC projects don't include timers.cpp/hpp 

Solution: add these
parent 7893a6ac
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 9 deletions
builds/msvc/vs2008/libzmq/libzmq.vcproj
View file @ 6665bffe
......@@ -160,6 +160,7 @@
<File RelativePath="..\..\..\..\src\tcp_connecter.cpp" />
<File RelativePath="..\..\..\..\src\tcp_listener.cpp" />
<File RelativePath="..\..\..\..\src\thread.cpp" />
<File RelativePath="..\..\..\..\src\timers.cpp" />
<File RelativePath="..\..\..\..\src\trie.cpp" />
<File RelativePath="..\..\..\..\src\v1_decoder.cpp" />
<File RelativePath="..\..\..\..\src\v1_encoder.cpp" />
......@@ -243,6 +244,7 @@
<File RelativePath="..\..\..\..\src\tcp_connecter.hpp" />
<File RelativePath="..\..\..\..\src\tcp_listener.hpp" />
<File RelativePath="..\..\..\..\src\thread.hpp" />
<File RelativePath="..\..\..\..\src\timers.hpp" />
<File RelativePath="..\..\..\..\src\trie.hpp" />
<File RelativePath="..\..\..\..\src\v1_decoder.hpp" />
<File RelativePath="..\..\..\..\src\v1_encoder.hpp" />
......
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View file @ 6665bffe
......@@ -147,6 +147,7 @@
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\timer.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
......@@ -233,6 +234,7 @@
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClInclude Include="..\..\..\..\src\timer.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
......@@ -257,4 +259,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View file @ 6665bffe
......@@ -147,6 +147,7 @@
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\timer.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
......@@ -233,6 +234,7 @@
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClInclude Include="..\..\..\..\src\timer.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
......@@ -257,4 +259,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View file @ 6665bffe
......@@ -146,6 +146,7 @@
<ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
<ClInclude Include="..\..\..\..\src\timer.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
......@@ -233,6 +234,7 @@
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClInclude Include="..\..\..\..\src\timer.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
......@@ -257,4 +259,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2015/libzmq/libzmq.vcxproj
View file @ 6665bffe
......@@ -147,6 +147,7 @@
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\timer.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
......@@ -233,6 +234,7 @@
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClInclude Include="..\..\..\..\src\timer.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
......@@ -257,4 +259,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
src/zmq.cpp
View file @ 6665bffe
......@@ -1180,7 +1180,7 @@ int zmq_poller_wait (void *poller_, zmq_poller_event_t *event, long timeout_)
// Timers
void *zmq_timers_new ()
void *zmq_timers_new (void)
{
zmq::timers_t *timers = new (std::nothrow) zmq::timers_t;
alloc_assert (timers);
......
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