diff options
| author | Jack Lloyd <[email protected]> | 2020-01-22 08:36:45 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-01-22 09:18:54 -0500 |
| commit | 8afc681704950df8f6cae99408b53d9fc536f7e7 (patch) | |
| tree | 13cb8f0ec9d2053a1f654cc49f2b5240b2636538 /src/lib/tls/tls_blocking.cpp | |
| parent | 206c18114e7e7336a6f41251979b979bb74223e7 (diff) | |
Remove support for splitting the amalgamation by ABI
This is as if --single-file-amalgamation was always used, except
also now botan_all_internal.h is not created.
This effectively drops support for very old GCC/Clang in the
amalgamation (only). GCC 5+ and Clang 3.8+ support the target
attribute and work fine. MSVC not affected since it doesn't need
such attributes in the first place.
Diffstat (limited to 'src/lib/tls/tls_blocking.cpp')
| -rw-r--r-- | src/lib/tls/tls_blocking.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/tls/tls_blocking.cpp b/src/lib/tls/tls_blocking.cpp index d89c11a2c..b9c699dc0 100644 --- a/src/lib/tls/tls_blocking.cpp +++ b/src/lib/tls/tls_blocking.cpp @@ -12,8 +12,6 @@ namespace Botan { namespace TLS { -using namespace std::placeholders; - Blocking_Client::Blocking_Client(read_fn reader, write_fn writer, Session_Manager& session_manager, @@ -31,9 +29,9 @@ Blocking_Client::Blocking_Client(read_fn reader, */ TLS::Compat_Callbacks::SILENCE_DEPRECATION_WARNING::PLEASE, writer, - std::bind(&Blocking_Client::data_cb, this, _1, _2), - std::function<void (Alert)>(std::bind(&Blocking_Client::alert_cb, this, _1)), - std::bind(&Blocking_Client::handshake_cb, this, _1) + std::bind(&Blocking_Client::data_cb, this, std::placeholders::_1, std::placeholders::_2), + std::function<void (Alert)>(std::bind(&Blocking_Client::alert_cb, this, std::placeholders::_1)), + std::bind(&Blocking_Client::handshake_cb, this, std::placeholders::_1) )), m_channel(*m_callbacks.get(), session_manager, |