mirror of
https://github.com/zeromq/libzmq.git
synced 2025-03-09 15:26:04 +00:00
Problem: MSVC projects don't include timers.cpp/hpp
Solution: add these
This commit is contained in:
parent
7893a6ac26
commit
6665bffe11
@ -160,6 +160,7 @@
|
|||||||
<File RelativePath="..\..\..\..\src\tcp_connecter.cpp" />
|
<File RelativePath="..\..\..\..\src\tcp_connecter.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\tcp_listener.cpp" />
|
<File RelativePath="..\..\..\..\src\tcp_listener.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\thread.cpp" />
|
<File RelativePath="..\..\..\..\src\thread.cpp" />
|
||||||
|
<File RelativePath="..\..\..\..\src\timers.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\trie.cpp" />
|
<File RelativePath="..\..\..\..\src\trie.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\v1_decoder.cpp" />
|
<File RelativePath="..\..\..\..\src\v1_decoder.cpp" />
|
||||||
<File RelativePath="..\..\..\..\src\v1_encoder.cpp" />
|
<File RelativePath="..\..\..\..\src\v1_encoder.cpp" />
|
||||||
@ -243,6 +244,7 @@
|
|||||||
<File RelativePath="..\..\..\..\src\tcp_connecter.hpp" />
|
<File RelativePath="..\..\..\..\src\tcp_connecter.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\tcp_listener.hpp" />
|
<File RelativePath="..\..\..\..\src\tcp_listener.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\thread.hpp" />
|
<File RelativePath="..\..\..\..\src\thread.hpp" />
|
||||||
|
<File RelativePath="..\..\..\..\src\timers.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\trie.hpp" />
|
<File RelativePath="..\..\..\..\src\trie.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\v1_decoder.hpp" />
|
<File RelativePath="..\..\..\..\src\v1_decoder.hpp" />
|
||||||
<File RelativePath="..\..\..\..\src\v1_encoder.hpp" />
|
<File RelativePath="..\..\..\..\src\v1_encoder.hpp" />
|
||||||
|
@ -147,6 +147,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
||||||
@ -233,6 +234,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||||
@ -257,4 +259,4 @@
|
|||||||
<ResourceCompile Include="..\..\resource.rc" />
|
<ResourceCompile Include="..\..\resource.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -147,6 +147,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
||||||
@ -233,6 +234,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||||
@ -257,4 +259,4 @@
|
|||||||
<ResourceCompile Include="..\..\resource.rc" />
|
<ResourceCompile Include="..\..\resource.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -146,6 +146,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||||
@ -233,6 +234,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||||
@ -257,4 +259,4 @@
|
|||||||
<ResourceCompile Include="..\..\resource.rc" />
|
<ResourceCompile Include="..\..\resource.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -147,6 +147,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
<ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
<ClInclude Include="..\..\..\..\src\thread.hpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
<ClInclude Include="..\..\..\..\src\trie.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
|
||||||
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
|
||||||
@ -233,6 +234,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
<ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
<ClCompile Include="..\..\..\..\src\thread.cpp" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\timer.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
<ClCompile Include="..\..\..\..\src\trie.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
|
||||||
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
|
||||||
@ -257,4 +259,4 @@
|
|||||||
<ResourceCompile Include="..\..\resource.rc" />
|
<ResourceCompile Include="..\..\resource.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -1180,7 +1180,7 @@ int zmq_poller_wait (void *poller_, zmq_poller_event_t *event, long timeout_)
|
|||||||
|
|
||||||
// Timers
|
// Timers
|
||||||
|
|
||||||
void *zmq_timers_new ()
|
void *zmq_timers_new (void)
|
||||||
{
|
{
|
||||||
zmq::timers_t *timers = new (std::nothrow) zmq::timers_t;
|
zmq::timers_t *timers = new (std::nothrow) zmq::timers_t;
|
||||||
alloc_assert (timers);
|
alloc_assert (timers);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user