Merge pull request #656 from cacharle/fix-std-max-compilation-error

gummif · web-flow · commit 78f91ad54c4f · 2025-04-18T19:45:52.000+02:00
Fix std::max compilation error on Windows
diff --git a/zmq.hpp b/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()));
         ZMQ_ASSERT(rc >= 0);
-        return static_cast<size_t>(std::max(rc, 0));
+        return static_cast<size_t>((std::max)(rc, 0));
     }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -2753,7 +2753,7 @@ template<typename T = no_user_data> class poller_t`
`2753`	`2753`	`{`
`2754`	`2754`	`int rc = zmq_poller_size(const_cast<void *>(poller_ptr.get()));`
`2755`	`2755`	`ZMQ_ASSERT(rc >= 0);`
`2756`		`- return static_cast<size_t>(std::max(rc, 0));`
	`2756`	`+ return static_cast<size_t>((std::max)(rc, 0));`
`2757`	`2757`	`}`
`2758`	`2758`	`#endif`
`2759`	`2759`