Skip to content

Commit ac1c3c3

Browse files
committed
Merge pull request #65 from K0n63n/master
Correction to pull request #56
2 parents df5ce17 + 308239d commit ac1c3c3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

zmq.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,17 @@ namespace zmq
127127
int errnum;
128128
};
129129

130-
inline int poll (zmq_pollitem_t const* items_, int nitems_, long timeout_ = -1)
130+
inline int poll (zmq_pollitem_t const* items_, size_t nitems_, long timeout_ = -1)
131131
{
132-
int rc = zmq_poll (const_cast<zmq_pollitem_t*>(items_), nitems_, timeout_);
132+
int rc = zmq_poll (const_cast<zmq_pollitem_t*>(items_), static_cast<int>(nitems_), timeout_);
133133
if (rc < 0)
134134
throw error_t ();
135135
return rc;
136136
}
137137

138138
inline int poll(zmq_pollitem_t const* items, size_t nitems)
139139
{
140-
return poll(items, static_cast<int>(nitems), -1);
140+
return poll(items, nitems, -1);
141141
}
142142

143143
#ifdef ZMQ_CPP11
@@ -153,7 +153,7 @@ namespace zmq
153153

154154
inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)
155155
{
156-
return poll(items.data(), static_cast<int>(items.size()), timeout_);
156+
return poll(items.data(), items.size(), timeout_);
157157
}
158158
#endif
159159

0 commit comments

Comments
 (0)