Merge pull request #56 from cmcmurrough/master

hintjens · hintjens · commit 4d79066be3c3 · 2015-11-06T02:05:22.000+01:00
fixed type mismatch warnings (size_t to int)
diff --git a/zmq.hpp b/zmq.hpp
@@ -131,7 +131,7 @@ namespace zmq
 
     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
@@ -147,7 +147,7 @@ namespace zmq
 
     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
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ namespace zmq`
`131`	`131`
`132`	`132`	`inline int poll(zmq_pollitem_t const* items, size_t nitems)`
`133`	`133`	`{`
`134`		`- return poll(items, nitems, -1 );`
	`134`	`+ return poll(items, static_cast<int>(nitems), -1);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`#ifdef ZMQ_CPP11`
`@@ -147,7 +147,7 @@ namespace zmq`
`147`	`147`
`148`	`148`	`inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)`
`149`	`149`	`{`
`150`		`- return poll(items.data(), items.size(), timeout_);`
	`150`	`+ return poll(items.data(), static_cast<int>(items.size()), timeout_);`
`151`	`151`	`}`
`152`	`152`	`#endif`
`153`	`153`