Merge pull request #496 from dimitry-ishenko-casparcg/2.1.0-fixes

[casparcg] / common / lock.h

diff --git a/common/lock.h b/common/lock.h
index 73316b2d205b234bc36598221876bbaa42ee2ff4..2501182b665958d03548416d8fd5f91ba444df65 100644 (file)
--- a/common/lock.h
+++ b/common/lock.h
@@ -1,12 +1,14 @@
-#pragma once\r
-\r
-namespace caspar {\r
-\r
-template<typename T, typename F>\r
-auto lock(T& mutex, F&& func) -> decltype(func())\r
-{\r
-       T::scoped_lock lock(mutex);\r
-       return func();\r
-}\r
-\r
-}
\ No newline at end of file
+#pragma once
+
+#include <boost/thread/lock_guard.hpp>
+
+namespace caspar {
+
+template<typename T, typename F>
+auto lock(T& mutex, F&& func) -> decltype(func())
+{
+       boost::lock_guard<T> lock(mutex);
+       return func();
+}
+
+}