From d152ccc1e2ae07cff4685a9d1b8146297fffba38 Mon Sep 17 00:00:00 2001 From: Spencer Stirling Date: Tue, 9 Jun 2015 11:59:26 -0600 Subject: fixed threadpool and atomics to work with Visual Studio 32 and 64 bit --- lib/pure/concurrency/threadpool.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/pure/concurrency') diff --git a/lib/pure/concurrency/threadpool.nim b/lib/pure/concurrency/threadpool.nim index 749a2fa2d..43a9dea11 100644 --- a/lib/pure/concurrency/threadpool.nim +++ b/lib/pure/concurrency/threadpool.nim @@ -290,7 +290,7 @@ proc slave(w: ptr Worker) {.thread.} = readyWorker = w signal(gSomeReady) await(w.taskArrived) - assert(not w.ready) + #assert(not w.ready) # doesn't work with Visual Studio w.f(w, w.data) if w.q.len != 0: w.cleanFlowVars if w.shutdown: -- cgit 1.4.1-2-gfad0 From 891d953a4cd0be4693204e3d62ae7a22ec89aba9 Mon Sep 17 00:00:00 2001 From: Spencer Stirling Date: Wed, 10 Jun 2015 07:23:07 -0600 Subject: disabled threadpool assertion only for vcc --- lib/pure/concurrency/threadpool.nim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/pure/concurrency') diff --git a/lib/pure/concurrency/threadpool.nim b/lib/pure/concurrency/threadpool.nim index 43a9dea11..247aa377c 100644 --- a/lib/pure/concurrency/threadpool.nim +++ b/lib/pure/concurrency/threadpool.nim @@ -290,7 +290,8 @@ proc slave(w: ptr Worker) {.thread.} = readyWorker = w signal(gSomeReady) await(w.taskArrived) - #assert(not w.ready) # doesn't work with Visual Studio + # XXX Somebody needs to look into this (why does this assertion fail in Visual Studio?) + when not defined(vcc): assert(not w.ready) w.f(w, w.data) if w.q.len != 0: w.cleanFlowVars if w.shutdown: -- cgit 1.4.1-2-gfad0