commit 7e573d326da077c03e88991d913f71d2e9e1c128
author danzh <danzh@google.com> Wed Jun 12 14:54:35 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 12 14:56:36 2019 -0700
tree 05b69891f9b7b8e90324aec03bc317467c0ee3d1
parent dad9acf01451bcf5b13ee2e58721d635acef65aa

gfe-relnote: n/a(code clean up) Fix quiche compile errors in envoy.

PiperOrigin-RevId: 252905372
Change-Id: Iae4dffd588d67ea6e80a3d90910c8629175c7cb6

quic/core/quic_framer.cc

diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 3267710..d186ad3 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -5118,7 +5118,6 @@
       const size_t num_encoded_gaps =
           (total_gap + std::numeric_limits<uint8_t>::max() - 1) /
           std::numeric_limits<uint8_t>::max();
-      DCHECK_LE(0u, num_encoded_gaps);
 
       // Append empty ACK blocks because the gap is longer than a single gap.
       for (size_t i = 1;

quic/core/tls_handshaker.cc

diff --git a/quic/core/tls_handshaker.cc b/quic/core/tls_handshaker.cc
index e27f5dd..aeadfd4 100644
--- a/quic/core/tls_handshaker.cc
+++ b/quic/core/tls_handshaker.cc
@@ -112,6 +112,9 @@
       return ENCRYPTION_HANDSHAKE;
     case ssl_encryption_application:
       return ENCRYPTION_FORWARD_SECURE;
+    default:
+      QUIC_BUG << "Invalid ssl_encryption_level_t " << static_cast<int>(level);
+      return ENCRYPTION_INITIAL;
   }
 }
 
@@ -128,7 +131,7 @@
     case ENCRYPTION_FORWARD_SECURE:
       return ssl_encryption_application;
     default:
-      QUIC_BUG << "Invalid encryption level " << level;
+      QUIC_BUG << "Invalid encryption level " << static_cast<int>(level);
       return ssl_encryption_initial;
   }
 }

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 6390016..6db0838 100644
--- a/quic/platform/api/quic_ip_address.cc
+++ b/quic/platform/api/quic_ip_address.cc
@@ -218,7 +218,7 @@
     return true;
   }
   DCHECK_LT(static_cast<size_t>(bytes_to_check), sizeof(address_.bytes));
-  int mask = (~0) << (8u - bits_to_check);
+  int mask = (~0u) << (8u - bits_to_check);
   return (lhs[bytes_to_check] & mask) == (rhs[bytes_to_check] & mask);
 }