commit 37e4e62c5aacbd3f07b5a89043e67c0101dcb2c7
author Christopher Kohlhoff <chris@kohlhoff.com> Tue Oct 14 22:22:47 2014 +1100
committer Christopher Kohlhoff <chris@kohlhoff.com> Thu Mar 19 19:53:59 2015 +1100
tree 99bb0d59958be7f322263534b99b1097bf24a5a2
parent f7695e66a4d5257b82d739c3d99cef830da678ff

Use correct type in byte order conversion of shorts.

asio/include/asio/detail/impl/socket_ops.ipp

diff --git a/asio/include/asio/detail/impl/socket_ops.ipp b/asio/include/asio/detail/impl/socket_ops.ipp
index 7488dd8..4beb397 100644
--- a/asio/include/asio/detail/impl/socket_ops.ipp
+++ b/asio/include/asio/detail/impl/socket_ops.ipp
@@ -3444,8 +3444,8 @@
 {
 #if defined(ASIO_WINDOWS_RUNTIME)
   unsigned char* value_p = reinterpret_cast<unsigned char*>(&value);
-  u_short_type result = (static_cast<u_long_type>(value_p[0]) << 8)
-    | static_cast<u_long_type>(value_p[1]);
+  u_short_type result = (static_cast<u_short_type>(value_p[0]) << 8)
+    | static_cast<u_short_type>(value_p[1]);
   return result;
 #else // defined(ASIO_WINDOWS_RUNTIME)
   return ntohs(value);
@@ -3455,7 +3455,7 @@
 u_short_type host_to_network_short(u_short_type value)
 {
 #if defined(ASIO_WINDOWS_RUNTIME)
-  u_long_type result;
+  u_short_type result;
   unsigned char* result_p = reinterpret_cast<unsigned char*>(&result);
   result_p[0] = static_cast<unsigned char>((value >> 8) & 0xFF);
   result_p[1] = static_cast<unsigned char>(value & 0xFF);