diff options
Diffstat (limited to 'src/ssl/tls_record.h')
| -rw-r--r-- | src/ssl/tls_record.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/ssl/tls_record.h b/src/ssl/tls_record.h index 09fd921c6..7d3bc4c6a 100644 --- a/src/ssl/tls_record.h +++ b/src/ssl/tls_record.h @@ -1,3 +1,4 @@ +1 /* * TLS Record Handling * (C) 2004-2010 Jack Lloyd @@ -14,24 +15,11 @@ #include <botan/mac.h> #include <botan/secqueue.h> #include <vector> - -#if defined(BOTAN_USE_STD_TR1) - -#if defined(BOTAN_BUILD_COMPILER_IS_MSVC) - #include <functional> -#else - #include <tr1/functional> -#endif - -#elif defined(BOTAN_USE_BOOST_TR1) - #include <boost/tr1/functional.hpp> -#else - #error "No TR1 library defined for use" -#endif +#include <functional> namespace Botan { -using namespace std::tr1::placeholders; +using namespace std::placeholders; /** * TLS Record Writer @@ -52,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: @@ -60,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; |