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

and unique_ptr.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/benchmark/benchmark.h b/src/benchmark/benchmark.h
index f3e43bd06..17df85e4e 100644
--- a/src/benchmark/benchmark.h
+++ b/src/benchmark/benchmark.h
@@ -12,6 +12,8 @@
 #include <botan/rng.h>
 #include <map>
 #include <string>
+#include <chrono>
+
 namespace Botan {
 
 /**
@@ -27,7 +29,7 @@ std::map<std::string, double>
 BOTAN_DLL algorithm_benchmark(const std::string& name,
                               Algorithm_Factory& af,
                               RandomNumberGenerator& rng,
-                              u32bit milliseconds,
+                              std::chrono::milliseconds milliseconds,
                               size_t buf_size);
 
 }