diff options
| author | lloyd <[email protected]> | 2012-02-20 17:09:46 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-02-20 17:09:46 +0000 |
| commit | 8c2dc1a6c3bf352a56622d569dc855ca8d6ab5e0 (patch) | |
| tree | 6f50627e2e73c2b1fc1295dde8b19c4f169de46d /src/tls/tls_record.h | |
| parent | 24c1546324995da70c51137ad138c3bb997a37b9 (diff) | |
| parent | e943fc67962b6e4dc2c7c64707dc2cf062728520 (diff) | |
propagate from branch 'net.randombit.botan.tls-state-machine' (head 0ceb9cde62a2b3614901ae85a53546d9fc641326)
to branch 'net.randombit.botan.cxx11' (head 777e65950ef3706a82e5df20dcca7fcc999ca533)
Diffstat (limited to 'src/tls/tls_record.h')
| -rw-r--r-- | src/tls/tls_record.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/tls/tls_record.h b/src/tls/tls_record.h index 3bc58a0da..f91cb6fe2 100644 --- a/src/tls/tls_record.h +++ b/src/tls/tls_record.h @@ -16,20 +16,7 @@ #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 { @@ -59,7 +46,7 @@ class BOTAN_DLL Record_Writer void set_maximum_fragment_size(size_t max_fragment); - 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 m_mac; } private: |