diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
| commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
| tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /src/Threads.cc | |
| parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
| parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) | |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'src/Threads.cc')
| -rw-r--r-- | src/Threads.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Threads.cc b/src/Threads.cc index 867013d..7b1b7bc 100644 --- a/src/Threads.cc +++ b/src/Threads.cc @@ -43,7 +43,7 @@ void * Balau::ThreadHelper::threadProc(void * arg) { void * r = NULL; bool success = false; try { - void * tls = g_tlsManager->createTLS(); + void * tls = Local::createTLS(); g_tlsManager->setTLS(tls); Balau::Thread * thread = reinterpret_cast<Balau::Thread *>(arg); r = thread->proc(); |