diff options
| author | Jack Lloyd <[email protected]> | 2018-05-07 13:39:01 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-05-07 13:39:01 -0400 |
| commit | 312f0194e09a2f2cef5af3750fd750a1d0137945 (patch) | |
| tree | fd5af810a578619b638b0daf76ebb9de711ceb0b /src/lib/tls/tls_server.cpp | |
| parent | 143e1a0ada9ad2b35985d1e32345a94c2080bc25 (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_server.cpp')
| -rw-r--r-- | src/lib/tls/tls_server.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/tls/tls_server.cpp b/src/lib/tls/tls_server.cpp index 786932a1d..2b1885e45 100644 --- a/src/lib/tls/tls_server.cpp +++ b/src/lib/tls/tls_server.cpp @@ -303,9 +303,9 @@ Server::Server(Callbacks& callbacks, } Server::Server(output_fn output, - data_cb data_cb, - alert_cb alert_cb, - handshake_cb handshake_cb, + data_cb got_data_cb, + alert_cb recv_alert_cb, + handshake_cb hs_cb, Session_Manager& session_manager, Credentials_Manager& creds, const Policy& policy, @@ -313,7 +313,7 @@ Server::Server(output_fn output, next_protocol_fn next_proto, bool is_datagram, size_t io_buf_sz) : - Channel(output, data_cb, alert_cb, handshake_cb, + Channel(output, got_data_cb, recv_alert_cb, hs_cb, Channel::handshake_msg_cb(), session_manager, rng, policy, is_datagram, io_buf_sz), m_creds(creds), @@ -323,9 +323,9 @@ Server::Server(output_fn output, Server::Server(output_fn output, - data_cb data_cb, - alert_cb alert_cb, - handshake_cb handshake_cb, + data_cb got_data_cb, + alert_cb recv_alert_cb, + handshake_cb hs_cb, handshake_msg_cb hs_msg_cb, Session_Manager& session_manager, Credentials_Manager& creds, @@ -333,7 +333,7 @@ Server::Server(output_fn output, RandomNumberGenerator& rng, next_protocol_fn next_proto, bool is_datagram) : - Channel(output, data_cb, alert_cb, handshake_cb, hs_msg_cb, + Channel(output, got_data_cb, recv_alert_cb, hs_cb, hs_msg_cb, session_manager, rng, policy, is_datagram), m_creds(creds), m_choose_next_protocol(next_proto) |