Merge changes from the witness.

2014-11-04 17:49:29 +00:00
parent 4cb60cc5ba
commit d019cd7080
86 changed files with 3534 additions and 882 deletions
--- a/src/nvthread/ThreadPool.cpp
+++ b/src/nvthread/ThreadPool.cpp
@ -50,7 +50,7 @@ AutoPtr<ThreadPool> s_pool;


 /*static*/ void ThreadPool::workerFunc(void * arg) {
-    uint i = toU32((uintptr_t)arg); // This is OK, because workerCount should always be much smaller than 2^32
+    uint i = U32((uintptr_t)arg); // This is OK, because workerCount should always be much smaller than 2^32

    while(true) 
    {