aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/tls/tls_client.cpp
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-05-07 13:39:01 -0400
committerJack Lloyd <[email protected]>2018-05-07 13:39:01 -0400
commit312f0194e09a2f2cef5af3750fd750a1d0137945 (patch)
treefd5af810a578619b638b0daf76ebb9de711ceb0b /src/lib/tls/tls_client.cpp
parent143e1a0ada9ad2b35985d1e32345a94c2080bc25 (diff)
Fix some warnings new in GCC 8.1
It thinks the typedefs are "locals" that are being conflicted with, which seems wrong to me but whatever.
Diffstat (limited to 'src/lib/tls/tls_client.cpp')
-rw-r--r--src/lib/tls/tls_client.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/tls/tls_client.cpp b/src/lib/tls/tls_client.cpp
index 39e69d8ea..94616c60b 100644
--- a/src/lib/tls/tls_client.cpp
+++ b/src/lib/tls/tls_client.cpp
@@ -64,10 +64,10 @@ Client::Client(Callbacks& callbacks,
init(offer_version, next_protos);
}
-Client::Client(output_fn output_fn,
+Client::Client(output_fn data_output_fn,
data_cb proc_cb,
- alert_cb alert_cb,
- handshake_cb handshake_cb,
+ alert_cb recv_alert_cb,
+ handshake_cb hs_cb,
Session_Manager& session_manager,
Credentials_Manager& creds,
const Policy& policy,
@@ -76,7 +76,7 @@ Client::Client(output_fn output_fn,
const Protocol_Version& offer_version,
const std::vector<std::string>& next_protos,
size_t io_buf_sz) :
- Channel(output_fn, proc_cb, alert_cb, handshake_cb, Channel::handshake_msg_cb(),
+ Channel(data_output_fn, proc_cb, recv_alert_cb, hs_cb, Channel::handshake_msg_cb(),
session_manager, rng, policy, offer_version.is_datagram_protocol(), io_buf_sz),
m_creds(creds),
m_info(info)
@@ -84,10 +84,10 @@ Client::Client(output_fn output_fn,
init(offer_version, next_protos);
}
-Client::Client(output_fn output_fn,
+Client::Client(output_fn data_output_fn,
data_cb proc_cb,
- alert_cb alert_cb,
- handshake_cb handshake_cb,
+ alert_cb recv_alert_cb,
+ handshake_cb hs_cb,
handshake_msg_cb hs_msg_cb,
Session_Manager& session_manager,
Credentials_Manager& creds,
@@ -96,7 +96,7 @@ Client::Client(output_fn output_fn,
const Server_Information& info,
const Protocol_Version& offer_version,
const std::vector<std::string>& next_protos) :
- Channel(output_fn, proc_cb, alert_cb, handshake_cb, hs_msg_cb,
+ Channel(data_output_fn, proc_cb, recv_alert_cb, hs_cb, hs_msg_cb,
session_manager, rng, policy, offer_version.is_datagram_protocol()),
m_creds(creds),
m_info(info)