Merge fixups. Add locking to default session manager. Use chrono lib

and unique_ptr.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/tls/tls_channel.h b/src/tls/tls_channel.h
index aa171ca4b..c85b32ba0 100644
--- a/src/tls/tls_channel.h
+++ b/src/tls/tls_channel.h
@@ -62,9 +62,9 @@ class BOTAN_DLL Channel
       */
       std::vector<X509_Certificate> peer_cert_chain() const { return peer_certs; }
 
-      Channel(std::tr1::function<void (const byte[], size_t)> socket_output_fn,
-                  std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
-                  std::tr1::function<bool (const Session&)> handshake_complete);
+      Channel(std::function<void (const byte[], size_t)> socket_output_fn,
+                  std::function<void (const byte[], size_t, Alert)> proc_fn,
+                  std::function<bool (const Session&)> handshake_complete);
 
       virtual ~Channel();
    protected:
@@ -85,8 +85,8 @@ class BOTAN_DLL Channel
 
       virtual void alert_notify(const Alert& alert) = 0;
 
-      std::tr1::function<void (const byte[], size_t, Alert)> proc_fn;
-      std::tr1::function<bool (const Session&)> handshake_fn;
+      std::function<void (const byte[], size_t, Alert)> proc_fn;
+      std::function<bool (const Session&)> handshake_fn;
 
       Record_Writer writer;
       Record_Reader reader;