<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dec135f8f14f3da906190935bb12e99cbdc9e13e">https://github.com/macports/macports-ports/commit/dec135f8f14f3da906190935bb12e99cbdc9e13e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dec135f zmq-devel: update to 20200520-c1d19564
</span>dec135f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dec135f8f14f3da906190935bb12e99cbdc9e13e
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu May 21 20:29:48 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> zmq-devel: update to 20200520-c1d19564
</span>---
devel/zmq/Portfile | 10 ++++-----
devel/zmq/files/patch-cxx11.devel.diff | 38 +++++++++++++++++-----------------
2 files changed, 24 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/Portfile b/devel/zmq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e9bf9d4..db42fc8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,11 +64,11 @@ subport zmq22 {
</span> }
subport zmq-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup zeromq libzmq b9b901e89d8db24442204970b1ddb62150c8d8bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200112-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c7679cc599e776e79237620304db95f518f0fd53 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f7980c2a6dca8705a2f1e4898e98d2f9bd5774b4e5619080ab0f33e9947fedc3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 880168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zeromq libzmq c1d195641d81c702e342772cd48aa3ad3481a352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200520-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7927dfe091ab759e1bf9ee00d0f2f39f1f5a839e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ec15f01638605198b0062c4b13a3f0d5181e791926b166e0bd442eaf646d2b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 908640
</span> revision 0
conflicts zmq zmq22 zmq3
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-cxx11.devel.diff b/devel/zmq/files/patch-cxx11.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 50602cd..7714d4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/files/patch-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git a/configure.ac b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 90c042e..b5bf97a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 800171f..337a266 100644
</span> --- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,15 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ index 90c042e..b5bf97a 100644
</span>
# Check whether to build a with debug symbols
diff --git a/perf/benchmark_radix_tree.cpp b/perf/benchmark_radix_tree.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index efc889c..4cfd4e8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 432d535..e5f097b 100644
</span> --- a/perf/benchmark_radix_tree.cpp
+++ b/perf/benchmark_radix_tree.cpp
@@ -27,7 +27,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ index efc889c..4cfd4e8 100644
</span> #include "radix_tree.hpp"
#include "trie.hpp"
diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3f62f6f..e1c9600 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d05837a..8a1c7ad 100644
</span> --- a/src/atomic_counter.hpp
+++ b/src/atomic_counter.hpp
@@ -35,7 +35,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ index 3f62f6f..e1c9600 100644
</span> #define ZMQ_ATOMIC_COUNTER_CXX11
#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7b34500..e85c9f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fa8bc7c..51b8058 100644
</span> --- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp
@@ -34,7 +34,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ index 7b34500..e85c9f8 100644
</span> #define ZMQ_ATOMIC_PTR_CXX11
#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
diff --git a/src/blob.hpp b/src/blob.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c14633c..66a5171 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5422161..9106bbc 100644
</span> --- a/src/blob.hpp
+++ b/src/blob.hpp
@@ -38,7 +38,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,15 +72,15 @@ index c14633c..66a5171 100644
</span> #define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
#define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
diff --git a/src/ctx.cpp b/src/ctx.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e362cfa..27ae764 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2b64c51..6dec399 100644
</span> --- a/src/ctx.cpp
+++ b/src/ctx.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -715,7 +715,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -725,7 +725,7 @@
</span> end = _endpoints.end ();
it != end;) {
if (it->second.socket == socket_)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(ZMQ_USE_CXX11) || (defined _MSC_VER && _MSC_VER >= 1700)
</span> it = _endpoints.erase (it);
#else
_endpoints.erase (it++);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,19 +98,19 @@ index b5ca3ac..52cdeaa 100644
</span> #else
#define ZMQ_HAS_EXTERN_TEMPLATE 0
diff --git a/src/options.hpp b/src/options.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b591e96..b3c36b5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 556eea4..8803711 100644
</span> --- a/src/options.hpp
+++ b/src/options.hpp
@@ -47,7 +47,7 @@
#include <sys/ucred.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(ZMQ_USE_CXX11) || (defined _MSC_VER && _MSC_VER >= 1700)
</span> #include <type_traits>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,7 +312,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,7 +324,7 @@
</span> template <typename T>
int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,23 +120,23 @@ index b591e96..b3c36b5 100644
</span> "invalid use of do_getsockopt");
#endif
diff --git a/src/radio.cpp b/src/radio.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 486732a..9605fff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aa9f100..538ad89 100644
</span> --- a/src/radio.cpp
+++ b/src/radio.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,7 +126,7 @@ void zmq::radio_t::xpipe_terminated (pipe_t *pipe_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +126,7 @@
</span> end = _subscriptions.end ();
it != end;) {
if (it->second == pipe_) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(ZMQ_USE_CXX11) || (defined _MSC_VER && _MSC_VER >= 1700)
</span> it = _subscriptions.erase (it);
#else
_subscriptions.erase (it++);
diff --git a/src/random.cpp b/src/random.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6a2c7e2..735e352 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 17c3537..8f8cfc0 100644
</span> --- a/src/random.cpp
+++ b/src/random.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,7 +100,7 @@ uint32_t zmq::generate_random ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,7 @@
</span> // configurable via config.h
// TODO this should probably be done via config.h
</pre><pre style='margin:0'>
</pre>