aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/tls/tls_channel.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_channel.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_channel.cpp')
-rw-r--r--src/lib/tls/tls_channel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/tls/tls_channel.cpp b/src/lib/tls/tls_channel.cpp
index 6e3e5987b..37f3ec415 100644
--- a/src/lib/tls/tls_channel.cpp
+++ b/src/lib/tls/tls_channel.cpp
@@ -40,7 +40,7 @@ Channel::Channel(Callbacks& callbacks,
Channel::Channel(output_fn out,
data_cb app_data_cb,
- alert_cb alert_cb,
+ alert_cb recv_alert_cb,
handshake_cb hs_cb,
handshake_msg_cb hs_msg_cb,
Session_Manager& session_manager,
@@ -55,7 +55,7 @@ Channel::Channel(output_fn out,
relies on a deprecated API
*/
Compat_Callbacks::SILENCE_DEPRECATION_WARNING::PLEASE,
- out, app_data_cb, alert_cb, hs_cb, hs_msg_cb)),
+ out, app_data_cb, recv_alert_cb, hs_cb, hs_msg_cb)),
m_callbacks(*m_compat_callbacks.get()),
m_session_manager(session_manager),
m_policy(policy),