commit 1711104b8a1771d2879b73cee1debfe017a66c15
author henrike@webrtc.org <henrike@webrtc.org> Wed Sep 10 22:10:24 2014
committer henrike@webrtc.org <henrike@webrtc.org> Wed Sep 10 22:10:24 2014
tree 4982a18812f3962dd430a68be562766b974ed6cc
parent 3472dcd7b07f8e8fa4b0ac72a3821e4581e41ebb

Fix MSVC warnings about value truncations, webrtc/base/ edition.

BUG=chromium:81439
TEST=none
R=henrike@webrtc.org, marpan@google.com

Review URL: https://webrtc-codereview.appspot.com/20249004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7143 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/base/socketaddress.cc

diff --git a/webrtc/base/socketaddress.cc b/webrtc/base/socketaddress.cc
index e6717e4..b15c0c4 100644
--- a/webrtc/base/socketaddress.cc
+++ b/webrtc/base/socketaddress.cc
@@ -121,7 +121,7 @@
 
 void SocketAddress::SetPort(int port) {
   ASSERT((0 <= port) && (port < 65536));
-  port_ = port;
+  port_ = static_cast<uint16>(port);
 }
 
 uint32 SocketAddress::ip() const {
@@ -279,9 +279,9 @@
 }
 
 static size_t ToSockAddrStorageHelper(sockaddr_storage* addr,
-                                      IPAddress ip, int port, int scope_id) {
+                                      IPAddress ip, uint16 port, int scope_id) {
   memset(addr, 0, sizeof(sockaddr_storage));
-  addr->ss_family = ip.family();
+  addr->ss_family = static_cast<unsigned short>(ip.family());
   if (addr->ss_family == AF_INET6) {
     sockaddr_in6* saddr = reinterpret_cast<sockaddr_in6*>(addr);
     saddr->sin6_addr = ip.ipv6_address();