commit 014f56d6a10b0f4806d13e109dc9a1e933ec19fb
author danzh <danzh@google.com> Fri Jun 07 13:53:34 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 07 13:54:57 2019 -0700
tree 4b7b7c6f4f21717bfd2eb183c4b21f1f9596bbc9
parent 1eb6d0fe5dd76efcb3ad2c478d2eec17487474ca

gfe-relnote: (n/a) code cleanup. Make quic_ip_address.cc compatible with envoy
compiler.

PiperOrigin-RevId: 252112812
Change-Id: Ieb11552abbd50e45fc47b52552b3d27251b1b426

quic/platform/api/quic_ip_address.cc

diff --git a/quic/platform/api/quic_ip_address.cc b/quic/platform/api/quic_ip_address.cc
index ebc71e1..6390016 100644
--- a/quic/platform/api/quic_ip_address.cc
+++ b/quic/platform/api/quic_ip_address.cc
@@ -5,6 +5,7 @@
 #include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h"
 
 #include <algorithm>
+#include <cstdint>
 #include <cstring>
 #include <string>
 
@@ -21,6 +22,8 @@
     case IpAddressFamily::IP_UNSPEC:
       return AF_UNSPEC;
   }
+  QUIC_BUG << "Invalid IpAddressFamily " << static_cast<int32_t>(family);
+  return AF_UNSPEC;
 }
 
 QuicIpAddress QuicIpAddress::Loopback4() {
@@ -81,6 +84,8 @@
     case IpAddressFamily::IP_UNSPEC:
       return true;
   }
+  QUIC_BUG << "Invalid IpAddressFamily " << static_cast<int32_t>(lhs.family_);
+  return false;
 }
 
 bool operator!=(QuicIpAddress lhs, QuicIpAddress rhs) {
@@ -108,6 +113,8 @@
     case IpAddressFamily::IP_UNSPEC:
       return "";
   }
+  QUIC_BUG << "Invalid IpAddressFamily " << static_cast<int32_t>(family_);
+  return "";
 }
 
 std::string QuicIpAddress::ToString() const {
@@ -211,7 +218,7 @@
     return true;
   }
   DCHECK_LT(static_cast<size_t>(bytes_to_check), sizeof(address_.bytes));
-  int mask = (~0) << (8 - bits_to_check);
+  int mask = (~0) << (8u - bits_to_check);
   return (lhs[bytes_to_check] & mask) == (rhs[bytes_to_check] & mask);
 }