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

and unique_ptr.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/benchmark/benchmark.cpp b/src/benchmark/benchmark.cpp
index cb5d8bb41..f44aabb1f 100644
--- a/src/benchmark/benchmark.cpp
+++ b/src/benchmark/benchmark.cpp
@@ -139,7 +139,7 @@ std::map<std::string, double>
 algorithm_benchmark(const std::string& name,
                     Algorithm_Factory& af,
                     RandomNumberGenerator& rng,
-                    u32bit milliseconds,
+                    std::chrono::milliseconds milliseconds,
                     size_t buf_size)
    {
    std::vector<std::string> providers = af.providers_of(name);