Skip to content

L
libzmq
Commit 7b2e37dc authored by Joe Eli McIlvain's avatar Joe Eli McIlvain
Browse files
Options

Merge pull request #1490 from evoskuil/master 

Problem: VS builds missing files, have warnings.
parents 0917eceb 81aa6f45
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 4 deletions
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View file @ 7b2e37dc
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<ClInclude Include="..\..\..\..\src\curve_client.hpp" /> <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
<ClInclude Include="..\..\..\..\src\curve_server.hpp" /> <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
<ClInclude Include="..\..\..\..\src\decoder.hpp" /> <ClInclude Include="..\..\..\..\src\decoder.hpp" />
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
<ClInclude Include="..\..\..\..\src\devpoll.hpp" /> <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
<ClInclude Include="..\..\..\..\src\dist.hpp" /> <ClInclude Include="..\..\..\..\src\dist.hpp" />
<ClInclude Include="..\..\..\..\src\encoder.hpp" /> <ClInclude Include="..\..\..\..\src\encoder.hpp" />
...@@ -168,6 +169,7 @@ ...@@ -168,6 +169,7 @@
<ClCompile Include="..\..\..\..\src\curve_client.cpp" /> <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
<ClCompile Include="..\..\..\..\src\curve_server.cpp" /> <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
<ClCompile Include="..\..\..\..\src\dealer.cpp" /> <ClCompile Include="..\..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
<ClCompile Include="..\..\..\..\src\devpoll.cpp" /> <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\..\src\dist.cpp" /> <ClCompile Include="..\..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\..\src\epoll.cpp" /> <ClCompile Include="..\..\..\..\src\epoll.cpp" />
......
builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
View file @ 7b2e37dc
...@@ -235,6 +235,9 @@ ...@@ -235,6 +235,9 @@
<ClCompile Include="..\..\..\..\src\mailbox_safe.cpp"> <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h"> <ClInclude Include="..\..\..\..\include\zmq_utils.h">
...@@ -513,6 +516,9 @@ ...@@ -513,6 +516,9 @@
<ClInclude Include="..\..\..\..\src\condition_variable.hpp"> <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
<Filter>src\include</Filter> <Filter>src\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="include"> <Filter Include="include">
......
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View file @ 7b2e37dc
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<ClInclude Include="..\..\..\..\src\curve_client.hpp" /> <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
<ClInclude Include="..\..\..\..\src\curve_server.hpp" /> <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
<ClInclude Include="..\..\..\..\src\decoder.hpp" /> <ClInclude Include="..\..\..\..\src\decoder.hpp" />
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
<ClInclude Include="..\..\..\..\src\devpoll.hpp" /> <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
<ClInclude Include="..\..\..\..\src\dist.hpp" /> <ClInclude Include="..\..\..\..\src\dist.hpp" />
<ClInclude Include="..\..\..\..\src\encoder.hpp" /> <ClInclude Include="..\..\..\..\src\encoder.hpp" />
...@@ -168,6 +169,7 @@ ...@@ -168,6 +169,7 @@
<ClCompile Include="..\..\..\..\src\curve_client.cpp" /> <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
<ClCompile Include="..\..\..\..\src\curve_server.cpp" /> <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
<ClCompile Include="..\..\..\..\src\dealer.cpp" /> <ClCompile Include="..\..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
<ClCompile Include="..\..\..\..\src\devpoll.cpp" /> <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\..\src\dist.cpp" /> <ClCompile Include="..\..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\..\src\epoll.cpp" /> <ClCompile Include="..\..\..\..\src\epoll.cpp" />
......
builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
View file @ 7b2e37dc
...@@ -235,6 +235,9 @@ ...@@ -235,6 +235,9 @@
<ClCompile Include="..\..\..\..\src\mailbox_safe.cpp"> <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h"> <ClInclude Include="..\..\..\..\include\zmq_utils.h">
...@@ -513,6 +516,9 @@ ...@@ -513,6 +516,9 @@
<ClInclude Include="..\..\..\..\src\condition_variable.hpp"> <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
<Filter>src\include</Filter> <Filter>src\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="include"> <Filter Include="include">
......
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View file @ 7b2e37dc
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<ClInclude Include="..\..\..\..\src\curve_client.hpp" /> <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
<ClInclude Include="..\..\..\..\src\curve_server.hpp" /> <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
<ClInclude Include="..\..\..\..\src\decoder.hpp" /> <ClInclude Include="..\..\..\..\src\decoder.hpp" />
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
<ClInclude Include="..\..\..\..\src\devpoll.hpp" /> <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
<ClInclude Include="..\..\..\..\src\dist.hpp" /> <ClInclude Include="..\..\..\..\src\dist.hpp" />
<ClInclude Include="..\..\..\..\src\encoder.hpp" /> <ClInclude Include="..\..\..\..\src\encoder.hpp" />
...@@ -168,6 +169,7 @@ ...@@ -168,6 +169,7 @@
<ClCompile Include="..\..\..\..\src\curve_client.cpp" /> <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
<ClCompile Include="..\..\..\..\src\curve_server.cpp" /> <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
<ClCompile Include="..\..\..\..\src\dealer.cpp" /> <ClCompile Include="..\..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
<ClCompile Include="..\..\..\..\src\devpoll.cpp" /> <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\..\src\dist.cpp" /> <ClCompile Include="..\..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\..\src\epoll.cpp" /> <ClCompile Include="..\..\..\..\src\epoll.cpp" />
......
builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
View file @ 7b2e37dc
...@@ -235,6 +235,9 @@ ...@@ -235,6 +235,9 @@
<ClCompile Include="..\..\..\..\src\mailbox_safe.cpp"> <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h"> <ClInclude Include="..\..\..\..\include\zmq_utils.h">
...@@ -513,6 +516,9 @@ ...@@ -513,6 +516,9 @@
<ClInclude Include="..\..\..\..\src\condition_variable.hpp"> <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
<Filter>src\include</Filter> <Filter>src\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="include"> <Filter Include="include">
......
src/decoder_allocators.cpp
View file @ 7b2e37dc
...@@ -38,7 +38,7 @@ zmq::shared_message_memory_allocator::shared_message_memory_allocator (std::size ...@@ -38,7 +38,7 @@ zmq::shared_message_memory_allocator::shared_message_memory_allocator (std::size
bufsize(0), bufsize(0),
max_size(bufsize_), max_size(bufsize_),
msg_refcnt(NULL), msg_refcnt(NULL),
maxCounters (std::ceil (static_cast <double> (max_size) / static_cast <double> (msg_t::max_vsm_size))) maxCounters (static_cast <size_t> (std::ceil (static_cast <double> (max_size) / static_cast <double> (msg_t::max_vsm_size))))
{ {
} }
......
src/err.cpp
View file @ 7b2e37dc
...@@ -212,13 +212,13 @@ void zmq::win_error (char *buffer_, size_t buffer_size_) ...@@ -212,13 +212,13 @@ void zmq::win_error (char *buffer_, size_t buffer_size_)
{ {
DWORD errcode = GetLastError (); DWORD errcode = GetLastError ();
#if defined _WIN32_WCE #if defined _WIN32_WCE
DWORD rc = FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | DWORD rc = FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL, FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL,
SUBLANG_DEFAULT), (LPWSTR)buffer_, buffer_size_ / sizeof(wchar_t), NULL ); SUBLANG_DEFAULT), (LPWSTR)buffer_, buffer_size_ / sizeof(wchar_t), NULL);
#else #else
DWORD rc = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM | DWORD rc = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL, FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL,
SUBLANG_DEFAULT), buffer_, (DWORD) buffer_size_, NULL ); SUBLANG_DEFAULT), buffer_, (DWORD) buffer_size_, NULL);
#endif #endif
zmq_assert (rc); zmq_assert (rc);
} }
......
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