summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven McCoy <steven.mccoy@miru.hk>2010-11-29 10:52:22 +0100
committerMartin Sustrik <sustrik@250bpm.com>2010-11-29 10:52:22 +0100
commit28db150aaf7b1cffb996f1b27bc082f75acec261 (patch)
treedf56667667864f362c5bc034dd62429de2f47ace
parent325dd2f0914de502ae7687f94927fa98c20380c9 (diff)
Fix thread thunker scope for MSVC.
Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
-rw-r--r--src/thread.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/thread.cpp b/src/thread.cpp
index 874190e..b2a99cd 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -27,7 +27,7 @@ extern "C"
{
static unsigned int __stdcall thread_routine (void *arg_)
{
- thread_t *self = (zmq::thread_t*) arg_;
+ zmq::thread_t *self = (zmq::thread_t*) arg_;
self->tfn (self->arg);
return 0;
}
@@ -38,7 +38,7 @@ void zmq::thread_t::start (thread_fn *tfn_, void *arg_)
tfn = tfn_;
arg =arg_;
descriptor = (HANDLE) _beginthreadex (NULL, 0,
- &zmq::thread_t::thread_routine, this, 0 , NULL);
+ &::thread_routine, this, 0 , NULL);
win_assert (descriptor != NULL);
}