mirror of
https://github.com/zeromq/cppzmq.git
synced 2025-06-04 05:47:19 +02:00
Merge pull request #656 from cacharle/fix-std-max-compilation-error
Fix std::max compilation error on Windows
This commit is contained in:
commit
78f91ad54c
2
zmq.hpp
2
zmq.hpp
@ -2753,7 +2753,7 @@ template<typename T = no_user_data> class poller_t
|
|||||||
{
|
{
|
||||||
int rc = zmq_poller_size(const_cast<void *>(poller_ptr.get()));
|
int rc = zmq_poller_size(const_cast<void *>(poller_ptr.get()));
|
||||||
ZMQ_ASSERT(rc >= 0);
|
ZMQ_ASSERT(rc >= 0);
|
||||||
return static_cast<size_t>(std::max(rc, 0));
|
return static_cast<size_t>((std::max)(rc, 0));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user