aboutsummaryrefslogtreecommitdiffstats
path: root/src/ssl/tls_record.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/ssl/tls_record.h')
-rw-r--r--src/ssl/tls_record.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/ssl/tls_record.h b/src/ssl/tls_record.h
index 84929b0ff..1f4576e31 100644
--- a/src/ssl/tls_record.h
+++ b/src/ssl/tls_record.h
@@ -15,14 +15,9 @@
#include <botan/mac.h>
#include <botan/secqueue.h>
#include <vector>
+#include <functional>
-#if defined(BOTAN_USE_STD_TR1)
- #include <tr1/functional>
-#elif defined(BOTAN_USE_BOOST_TR1)
- #include <boost/tr1/functional.hpp>
-#endif
-
-using namespace std::tr1::placeholders;
+using namespace std::placeholders;
namespace Botan {
@@ -45,7 +40,7 @@ class BOTAN_DLL Record_Writer
void reset();
- Record_Writer(std::tr1::function<void (const byte[], size_t)> output_fn);
+ Record_Writer(std::function<void (const byte[], size_t)> output_fn);
~Record_Writer() { delete mac; }
private:
@@ -53,7 +48,7 @@ class BOTAN_DLL Record_Writer
void send_record(byte type, byte major, byte minor,
const byte input[], size_t length);
- std::tr1::function<void (const byte[], size_t)> output_fn;
+ std::function<void (const byte[], size_t)> output_fn;
Pipe cipher;
MessageAuthenticationCode* mac;