Lock helper now returns value.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1928 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/concurrency/lock.h b/common/concurrency/lock.h
index 1182d09c2ee62862684fcd5bef07617e2307779b..73316b2d205b234bc36598221876bbaa42ee2ff4 100644 (file)
--- a/common/concurrency/lock.h
+++ b/common/concurrency/lock.h
@@ -3,10 +3,10 @@
 namespace caspar {\r
 \r
 template<typename T, typename F>\r
-void lock(T& mutex, F&& func)\r
+auto lock(T& mutex, F&& func) -> decltype(func())\r
 {\r
        T::scoped_lock lock(mutex);\r
-       func();\r
+       return func();\r
 }\r
 \r
 }
\ No newline at end of file