Merge pull request #1490 from evoskuil/master

Problem: VS builds missing files, have warnings.
zeromq · Jul 27, 2015 · 7b2e37d · 7b2e37d
2 parents 0917ece + 81aa6f4
commit 7b2e37d
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 4 deletions.
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
@@ -82,6 +82,7 @@
  <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
  <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
  <ClInclude Include="..\..\..\..\src\decoder.hpp" />
+ <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
  <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
  <ClInclude Include="..\..\..\..\src\dist.hpp" />
  <ClInclude Include="..\..\..\..\src\encoder.hpp" />
@@ -168,6 +169,7 @@
  <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
  <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
  <ClCompile Include="..\..\..\..\src\dealer.cpp" />
+ <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
  <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
  <ClCompile Include="..\..\..\..\src\dist.cpp" />
  <ClCompile Include="..\..\..\..\src\epoll.cpp" />

diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
@@ -235,6 +235,9 @@
  <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
  <Filter>src</Filter>
  </ClCompile>
+ <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -513,6 +516,9 @@
  <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
  <Filter>src\include</Filter>
  </ClInclude>
+ <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <Filter Include="include">

diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
@@ -82,6 +82,7 @@
  <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
  <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
  <ClInclude Include="..\..\..\..\src\decoder.hpp" />
+ <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
  <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
  <ClInclude Include="..\..\..\..\src\dist.hpp" />
  <ClInclude Include="..\..\..\..\src\encoder.hpp" />
@@ -168,6 +169,7 @@
  <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
  <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
  <ClCompile Include="..\..\..\..\src\dealer.cpp" />
+ <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
  <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
  <ClCompile Include="..\..\..\..\src\dist.cpp" />
  <ClCompile Include="..\..\..\..\src\epoll.cpp" />

diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
@@ -235,6 +235,9 @@
  <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
  <Filter>src</Filter>
  </ClCompile>
+ <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -513,6 +516,9 @@
  <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
  <Filter>src\include</Filter>
  </ClInclude>
+ <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <Filter Include="include">

diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
@@ -82,6 +82,7 @@
  <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
  <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
  <ClInclude Include="..\..\..\..\src\decoder.hpp" />
+ <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
  <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
  <ClInclude Include="..\..\..\..\src\dist.hpp" />
  <ClInclude Include="..\..\..\..\src\encoder.hpp" />
@@ -168,6 +169,7 @@
  <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
  <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
  <ClCompile Include="..\..\..\..\src\dealer.cpp" />
+ <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
  <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
  <ClCompile Include="..\..\..\..\src\dist.cpp" />
  <ClCompile Include="..\..\..\..\src\epoll.cpp" />

diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
@@ -235,6 +235,9 @@
  <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
  <Filter>src</Filter>
  </ClCompile>
+ <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -513,6 +516,9 @@
  <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
  <Filter>src\include</Filter>
  </ClInclude>
+ <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <Filter Include="include">

diff --git a/src/decoder_allocators.cpp b/src/decoder_allocators.cpp
@@ -38,7 +38,7 @@ zmq::shared_message_memory_allocator::shared_message_memory_allocator (std::size
  bufsize(0),
  max_size(bufsize_),
  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))))
 {
 }
 

diff --git a/src/err.cpp b/src/err.cpp
@@ -212,13 +212,13 @@ void zmq::win_error (char *buffer_, size_t buffer_size_)
 {
  DWORD errcode = GetLastError ();
 #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,
- SUBLANG_DEFAULT), (LPWSTR)buffer_, buffer_size_ / sizeof(wchar_t), NULL );
+ SUBLANG_DEFAULT), (LPWSTR)buffer_, buffer_size_ / sizeof(wchar_t), NULL);
 #else
  DWORD rc = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM |
  FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL,
- SUBLANG_DEFAULT), buffer_, (DWORD) buffer_size_, NULL );
+ SUBLANG_DEFAULT), buffer_, (DWORD) buffer_size_, NULL);
 #endif
  zmq_assert (rc);
 }