Merge changes from The Witness.

2012-07-20 16:32:26 +00:00
parent 3b4fcd0369
commit 04bdc76749
15 changed files with 280 additions and 124 deletions
--- a/src/nvthread/ParallelFor.cpp
+++ b/src/nvthread/ParallelFor.cpp
@ -16,7 +16,7 @@ using namespace nv;
 #define ENABLE_PARALLEL_FOR 0
 #endif

-void worker(void * arg) {
+static void worker(void * arg) {
    ParallelFor * owner = (ParallelFor *)arg;

    while(true) {