3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3903 from bjovke/msvc_cplusplus

Browse Source 
Problem: MSVC always reports __cplusplus macro value as 199711L. Some…
This commit is contained in:
Luca Boccassi 2020-05-09 10:50:43 +01:00 committed by GitHub
commit be77a8d932
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ctx.cpp
View File

@ -725,7 +725,7 @@ void zmq::ctx_t::unregister_endpoints (const socket_base_t *const socket_)
end = _endpoints.end ();
it != end;) {
if (it->second.socket == socket_)
#if __cplusplus >= 201103L
#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
it = _endpoints.erase (it);
#else
_endpoints.erase (it++);

2
src/options.hpp
View File

@ -47,7 +47,7 @@
#include <sys/ucred.h>
#endif
#if __cplusplus >= 201103L
#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
#include <type_traits>
#endif

2
src/radio.cpp
View File

@ -126,7 +126,7 @@ void zmq::radio_t::xpipe_terminated (pipe_t *pipe_)
end = _subscriptions.end ();
it != end;) {
if (it->second == pipe_) {
#if __cplusplus >= 201103L
#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
it = _subscriptions.erase (it);
#else
_subscriptions.erase (it++);