[trafficserver] branch master updated: Changes the string_view::length to ::size

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new fc0ddfa  Changes the string_view::length to ::size
fc0ddfa is described below

commit fc0ddfa3bd0d2191d92035bc9ec8fc127d0d1d21
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Wed Jan 16 08:47:51 2019 -0700

    Changes the string_view::length to ::size
---
 iocore/net/Net.cc                | 4 ++--
 iocore/net/UnixNetVConnection.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/iocore/net/Net.cc b/iocore/net/Net.cc
index a2c5f5f..3ac1c82 100644
--- a/iocore/net/Net.cc
+++ b/iocore/net/Net.cc
@@ -64,11 +64,11 @@ configure_net()
 
   REC_ReadConfigStringAlloc(ccp, "proxy.config.net.tcp_congestion_control_in");
   if (ccp && *ccp != '\0') {
-    net_ccp_in = {ccp};
+    net_ccp_in = ccp;
   }
   REC_ReadConfigStringAlloc(ccp, "proxy.config.net.tcp_congestion_control_out");
   if (ccp && *ccp != '\0') {
-    net_ccp_out = {ccp};
+    net_ccp_out = ccp;
   }
 }
 
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index f005f3d..8b117f1 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -1538,7 +1538,7 @@ UnixNetVConnection::set_tcp_congestion_control(int side)
   }
 
   if (!ccp.empty()) {
-    int rv = setsockopt(con.fd, IPPROTO_TCP, TCP_CONGESTION, reinterpret_cast<const void *>(ccp.data()), ccp.length());
+    int rv = setsockopt(con.fd, IPPROTO_TCP, TCP_CONGESTION, reinterpret_cast<const void *>(ccp.data()), ccp.size());
 
     if (rv < 0) {
       Error("Unable to set TCP congestion control on socket %d to \"%s\", errno=%d (%s)", con.fd, ccp.data(), errno,