debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix compile error when calling async() an unshared delegate.

Browse source 
(cherry picked from commit a8faddf64170e5d1347b67e1d48b7796bbe08fd9)
This commit is contained in:
Sönke Ludwig 2016-04-10 14:22:03 +02:00
parent 179d93f09d
commit 508669b781
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/vibe/core/concurrency.d
View file

@ -1127,6 +1127,8 @@ Future!(ReturnType!CALLABLE) async(CALLABLE, ARGS...)(CALLABLE callable, ARGS ar
if (is(typeof(callable(args)) == ReturnType!CALLABLE))
{
import vibe.core.core;
import std.functional : toDelegate;
alias RET = ReturnType!CALLABLE;
Future!RET ret;
ret.init();
@ -1136,7 +1138,7 @@ Future!(ReturnType!CALLABLE) async(CALLABLE, ARGS...)(CALLABLE callable, ARGS ar
static if (isWeaklyIsolated!CALLABLE && isWeaklyIsolated!ARGS) {
ret.m_task = runWorkerTaskH(&compute, ret.m_result, callable, args);
} else {
ret.m_task = runTask(&compute, ret.m_result, callable, args);
ret.m_task = runTask(toDelegate(&compute), ret.m_result, callable, args);
}
return ret;
}
@ -1164,6 +1166,28 @@ unittest {
}
}
///
unittest {
int sum(int a, int b)
{
return a + b;
}
static int sum2(int a, int b)
{
return a + b;
}
void test()
{
// Using a delegate will use runTask internally
assert(async(&sum, 2, 3).getResult() == 5);
// Using a static function will use runTaskWorker internally,
// if all arguments are weakly isolated
assert(async(&sum2, 2, 3).getResult() == 5);
}
}
/******************************************************************************/
/* std.concurrency compatible interface for message passing */