summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-05-17 14:27:03 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-05-17 14:27:03 +0200
commit9e6b39925603f9e64db08c469bd628d7ef9465de (patch)
tree8837c83646bcd66dc211af32b960d126f02e79db /src
parentda7b6d0b3893fd14859b77ec69eed0fc6c8ad689 (diff)
Couple of minor issues in MSVC build fixed
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src')
-rw-r--r--src/pgm_socket.cpp2
-rw-r--r--src/tcp_socket.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index 7011452..90a265c 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -682,7 +682,7 @@ int zmq::pgm_socket_t::compute_sqns (int tpdu_)
if (sqns == 0)
sqns = 1;
- return sqns;
+ return (int) sqns;
}
#endif
diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp
index eb8b032..2257e4f 100644
--- a/src/tcp_socket.cpp
+++ b/src/tcp_socket.cpp
@@ -93,7 +93,7 @@ int zmq::tcp_socket_t::write (const void *data_, size_t size_)
return (size_t) nbytes;
}
-int zmq::tcp_socket_t::read (void *data_, size_t size)
+int zmq::tcp_socket_t::read (void *data_, size_t size_)
{
int nbytes = recv (s, (char*) data_, (int) size_, 0);