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.h | |
| 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.h')
| -rw-r--r-- | src/lib/tls/tls_server.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/tls/tls_server.h b/src/lib/tls/tls_server.h index 7c5d9668f..c55c3f93d 100644 --- a/src/lib/tls/tls_server.h +++ b/src/lib/tls/tls_server.h @@ -61,12 +61,13 @@ class BOTAN_PUBLIC_API(2,0) Server final : public Channel /** * DEPRECATED. This constructor is only provided for backward * compatibility and should not be used in new implementations. + * It will be removed in a future release. */ BOTAN_DEPRECATED("Use TLS::Server(TLS::Callbacks ...)") Server(output_fn output, data_cb data_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, @@ -79,12 +80,13 @@ class BOTAN_PUBLIC_API(2,0) Server final : public Channel /** * DEPRECATED. This constructor is only provided for backward * compatibility and should not be used in new implementations. + * It will be removed in a future release. */ BOTAN_DEPRECATED("Use TLS::Server(TLS::Callbacks ...)") Server(output_fn output, data_cb data_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, |