From: hellgore <hellgore@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Fri, 7 Sep 2012 07:40:52 +0000 (+0000)
Subject: Refactored executor to support try_begin_invoke which does not block until room is... 
X-Git-Tag: 2.1.0_Beta1~500
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ca5cce6b0717681925e99d500de4ab9dfa026f92;p=casparcg

Refactored executor to support try_begin_invoke which does not block until room is available in the executor queue, but returns immediately instead.

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

diff --git a/common/executor.h b/common/executor.h
index 5c296dec0..75642ffe2 100644
--- a/common/executor.h
+++ b/common/executor.h
@@ -116,7 +116,7 @@ public:
 	}
 	
 	template<typename Func>
-	auto try_begin_invoke(Func&& func, task_priority priority = normal_priority) -> boost::unique_future<decltype(func())>
+	auto try_begin_invoke(Func&& func, task_priority priority = task_priority::normal_priority) -> boost::unique_future<decltype(func())>
 	{	
 		if(!is_running_)
 			BOOST_THROW_EXCEPTION(invalid_operation() << msg_info("executor not running."));