propagate from branch 'net.randombit.botan' (head 303b2518a80553214b1e5ab4d9b96ef54629cbc7)

            to branch 'net.randombit.botan.c++0x' (head d734eefabe4816be4dd3e3e6e7bb13b7ab5be148)

1 files changed, 4 insertions, 13 deletions

diff --git a/src/ssl/tls_record.h b/src/ssl/tls_record.h
index 7a223095f..40b6a6f8d 100644
--- a/src/ssl/tls_record.h
+++ b/src/ssl/tls_record.h
@@ -14,18 +14,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>
-#else
-  #error "No TR1 library defined for use"
-#endif
-
-namespace Botan {
-
-using namespace std::tr1::placeholders;
+using namespace std::placeholders;
 
 /**
 * TLS Record Writer
@@ -46,7 +37,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:
@@ -54,7 +45,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;