function<> is in in std in C++0x

6 files changed, 11 insertions, 18 deletions

diff --git a/src/ssl/info.txt b/src/ssl/info.txt
index 8b566ae60..8f1eda497 100644
--- a/src/ssl/info.txt
+++ b/src/ssl/info.txt
@@ -1,7 +1,5 @@
 define SSL_TLS
 
-uses_tr1 yes
-
 <header:public>
 socket.h
 tls_client.h
diff --git a/src/ssl/rec_wri.cpp b/src/ssl/rec_wri.cpp
index 0be275c20..04b58e12f 100644
--- a/src/ssl/rec_wri.cpp
+++ b/src/ssl/rec_wri.cpp
@@ -16,7 +16,7 @@ namespace Botan {
 /**
 * Record_Writer Constructor
 */
-Record_Writer::Record_Writer(std::tr1::function<void (const byte[], size_t)> out) :
+Record_Writer::Record_Writer(std::function<void (const byte[], size_t)> out) :
    output_fn(out),
    buffer(DEFAULT_BUFFERSIZE)
    {
diff --git a/src/ssl/tls_client.cpp b/src/ssl/tls_client.cpp
index 505b2c22a..206d5f028 100644
--- a/src/ssl/tls_client.cpp
+++ b/src/ssl/tls_client.cpp
@@ -81,8 +81,8 @@ void client_check_state(Handshake_Type new_msg, Handshake_State* state)
 /**
 * TLS Client Constructor
 */
-TLS_Client::TLS_Client(std::tr1::function<size_t (byte[], size_t)> input_fn,
-                       std::tr1::function<void (const byte[], size_t)> output_fn,
+TLS_Client::TLS_Client(std::function<size_t (byte[], size_t)> input_fn,
+                       std::function<void (const byte[], size_t)> output_fn,
                        const TLS_Policy& policy,
                        RandomNumberGenerator& rng) :
    input_fn(input_fn),
diff --git a/src/ssl/tls_client.h b/src/ssl/tls_client.h
index 913a87e50..0ee975e0f 100644
--- a/src/ssl/tls_client.h
+++ b/src/ssl/tls_client.h
@@ -33,8 +33,8 @@ class BOTAN_DLL TLS_Client : public TLS_Connection
       void add_client_cert(const X509_Certificate& cert,
                            Private_Key* cert_key);
 
-      TLS_Client(std::tr1::function<size_t (byte[], size_t)> input_fn,
-                 std::tr1::function<void (const byte[], size_t)> output_fn,
+      TLS_Client(std::function<size_t (byte[], size_t)> input_fn,
+                 std::function<void (const byte[], size_t)> output_fn,
                  const TLS_Policy& policy,
                  RandomNumberGenerator& rng);
 
@@ -51,7 +51,7 @@ class BOTAN_DLL TLS_Client : public TLS_Connection
       void read_handshake(byte, const MemoryRegion<byte>&);
       void process_handshake_msg(Handshake_Type, const MemoryRegion<byte>&);
 
-      std::tr1::function<size_t (byte[], size_t)> input_fn;
+      std::function<size_t (byte[], size_t)> input_fn;
 
       const TLS_Policy& policy;
       RandomNumberGenerator& rng;
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;
 
diff --git a/src/ssl/tls_server.cpp b/src/ssl/tls_server.cpp
index 6f79fe0fb..65f4204c8 100644
--- a/src/ssl/tls_server.cpp
+++ b/src/ssl/tls_server.cpp
@@ -93,7 +93,7 @@ TLS_Server::TLS_Server(const TLS_Policy& pol,
    policy(pol),
    rng(r),
    peer(sock),
-   writer(std::tr1::bind(&Socket::write, std::tr1::ref(peer), _1, _2))
+   writer(std::bind(&Socket::write, std::ref(peer), _1, _2))
    {
    state = 0;