summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-05-05 13:03:56 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-05-05 13:03:56 +0200
commit10f5334f2891b187ce57f38186cf977406097ab0 (patch)
treea4e99c0acc27eef6eb1e64d3f11b06cc30f7ab68
parent44dd005ff05431b05a8e04858a23784b252da870 (diff)
parent3f5465ada1b465ac0e360d0416b8f42b0fddfab0 (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
-rw-r--r--src/signaler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/signaler.cpp b/src/signaler.cpp
index 0fa43f7..54f48c6 100644
--- a/src/signaler.cpp
+++ b/src/signaler.cpp
@@ -40,7 +40,7 @@ zmq::fd_t zmq::signaler_t::get_fd ()
#if defined ZMQ_HAVE_WINDOWS
-zmq::signaler_t::signaler_t () :
+zmq::signaler_t::signaler_t ()
{
// Windows have no 'socketpair' function. CreatePipe is no good as pipe
// handles cannot be polled on. Here we create the socketpair by hand.
@@ -106,7 +106,7 @@ void zmq::signaler_t::send (const command_t &cmd_)
// TODO: Note that send is a blocking operation.
// How should we behave if the signal cannot be written to the signaler?
// Even worse: What if half of a command is written?
- int rc = send (w, (char*) &cmd_, sizeof (command_t), 0);
+ int rc = ::send (w, (char*) &cmd_, sizeof (command_t), 0);
win_assert (rc != SOCKET_ERROR);
zmq_assert (rc == sizeof (command_t));
}
@@ -122,7 +122,7 @@ bool zmq::signaler_t::recv (command_t *cmd_, bool block_)
}
bool result;
- int nbytes = recv (r, (char*) cmd_, sizeof (command_t), 0);
+ int nbytes = ::recv (r, (char*) cmd_, sizeof (command_t), 0);
if (nbytes == -1 && WSAGetLastError () == WSAEWOULDBLOCK) {
result = false;
}