mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-14 01:37:56 +08:00
Merge pull request #3903 from bjovke/msvc_cplusplus
Problem: MSVC always reports __cplusplus macro value as 199711L. Some…
This commit is contained in:
commit
be77a8d932
@ -725,7 +725,7 @@ void zmq::ctx_t::unregister_endpoints (const socket_base_t *const socket_)
|
|||||||
end = _endpoints.end ();
|
end = _endpoints.end ();
|
||||||
it != end;) {
|
it != end;) {
|
||||||
if (it->second.socket == socket_)
|
if (it->second.socket == socket_)
|
||||||
#if __cplusplus >= 201103L
|
#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
|
||||||
it = _endpoints.erase (it);
|
it = _endpoints.erase (it);
|
||||||
#else
|
#else
|
||||||
_endpoints.erase (it++);
|
_endpoints.erase (it++);
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
#include <sys/ucred.h>
|
#include <sys/ucred.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if __cplusplus >= 201103L
|
#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ void zmq::radio_t::xpipe_terminated (pipe_t *pipe_)
|
|||||||
end = _subscriptions.end ();
|
end = _subscriptions.end ();
|
||||||
it != end;) {
|
it != end;) {
|
||||||
if (it->second == pipe_) {
|
if (it->second == pipe_) {
|
||||||
#if __cplusplus >= 201103L
|
#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
|
||||||
it = _subscriptions.erase (it);
|
it = _subscriptions.erase (it);
|
||||||
#else
|
#else
|
||||||
_subscriptions.erase (it++);
|
_subscriptions.erase (it++);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user