Merge pull request #56 from cmcmurrough/master

fixed type mismatch warnings (size_t to int)
This commit is contained in:
Pieter Hintjens 2015-11-06 02:05:22 +01:00
commit 4d79066be3

View File

@ -131,7 +131,7 @@ namespace zmq
inline int poll(zmq_pollitem_t const* items, size_t nitems) inline int poll(zmq_pollitem_t const* items, size_t nitems)
{ {
return poll(items, nitems, -1 ); return poll(items, static_cast<int>(nitems), -1);
} }
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11
@ -147,7 +147,7 @@ namespace zmq
inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1) inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)
{ {
return poll(items.data(), items.size(), timeout_); return poll(items.data(), static_cast<int>(items.size()), timeout_);
} }
#endif #endif