<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/94fe4e47ea03ccd27d0d64114bfd9c96f52d9e2d">https://github.com/macports/macports-ports/commit/94fe4e47ea03ccd27d0d64114bfd9c96f52d9e2d</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 94fe4e4 gnuradio-next: update to 20190520-c7780bb2
</span>94fe4e4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94fe4e47ea03ccd27d0d64114bfd9c96f52d9e2d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed May 22 19:51:23 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: update to 20190520-c7780bb2
</span>---
science/gnuradio/Portfile | 39 ++-
.../gnuradio/files/patch-C_CXX_STANDARD.next.diff | 16 +-
.../files/patch-fix-rpc-unused-vars.next.diff | 120 ++++++++
.../gnuradio/files/patch-fix_boost_asio.next.diff | 22 ++
.../gnuradio/files/patch-fix_includes.next.diff | 70 -----
.../patch-fix_runtime_swigTargets_dest.next.diff | 11 +
.../gnuradio/files/patch-fix_zmq_4.3.1.next.diff | 316 +++++++++++++++++++++
7 files changed, 508 insertions(+), 86 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 817b2b6..d929ce1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,12 +77,12 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 0ab1a75a8181e2d89d82b499913d5e30b2bca018
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190221
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e108e3a6da22301cb8ea1f7414b98eb57ef3844e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0adf8f6c4fae5fa8513f248fc7d35abd59920a310e073c709d4850a32bad315c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3430840
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio c7780bb2abaebd4a0a3ce0ada5d446d554b8adcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190520-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a136a2bf5e0888d24b936c3140afd69aa281ae64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 403d63093a8d0a5a20fa9059bb6903ee15057a54b290bc9817bf00201b40766a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3385593
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,8 +175,8 @@ if {${subport} eq "gnuradio"} {
</span> # patches for next
# temporary patch to fix CTRLPORT testing
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-fix_ctrlport_test.next.diff
</span>
# temporary patch to fix and allow external setting for
# CMAKE_C/CXX_STANDARD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,6 +184,29 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-C_CXX_STANDARD.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix build for Boost 1.70.0, specifically a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # changed API for boost::asio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_boost_asio.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix the install destination for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # runtime_swigTargets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_runtime_swigTargets_dest.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix building with ZMQ >= 4.3.1, which removes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a deprecated API for "recv" and deprecates a similar "send" API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_zmq_4.3.1.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix unused RPC variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-rpc-unused-vars.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff b/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 553fa36..3197b3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,12 +131,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,12 +135,16 @@
</span> MESSAGE(status "Skipping compiler version check.")
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,17 +17,17 @@
</span> -SET(CMAKE_CXX_EXTENSIONS OFF)
+# save current setting, if provided
+IF(CMAKE_CXX_STANDARD)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_STANDARD_EXT ${CMAKE_CXX_STANDARD})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_CXX_STANDARD_EXT ${CMAKE_CXX_STANDARD})
</span> +ENDIF()
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_CXX_STANDARD 11)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,9 +149,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,9 +153,60 @@
</span> ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
SET(CMAKE_CXX_STANDARD 11)
ELSE()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MESSAGE(WARNING "C++ standard could not be set because compiler is not GNU, Clang, or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(WARNING "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(WARNING "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span> +ENDIF()
+
+# if the CXX standard was provided externally, make sure it meets GR's minimum
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,12 +84,12 @@
</span> IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_C_STANDARD 11)
ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,7 +210,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,7 +214,58 @@
</span> ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
SET(CMAKE_C_STANDARD 11)
ELSE()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MESSAGE(WARNING "C standard could not be set because compiler is not GNU, Clang, or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(WARNING "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(WARNING "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</span> +ENDIF()
+
+# if the C standard was provided externally, make sure it meets GR's minimum
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-rpc-unused-vars.next.diff b/science/gnuradio/files/patch-fix-rpc-unused-vars.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..341f2a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix-rpc-unused-vars.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,120 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/include/gnuradio/rpcmanager.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/include/gnuradio/rpcmanager.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool make_aggregator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool booter_registered;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool aggregator_registered;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static void rpcserver_booter_base_sptr_dest(rpcserver_booter_base* b) {;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static void rpcserver_booter_base_sptr_dest(rpcserver_booter_base* b) {(void) b;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static std::unique_ptr<rpcserver_booter_base> boot;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static std::unique_ptr<rpcserver_booter_aggregator> aggregator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~rpcextractor_base() {;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::runtime_error("rpcextractor_base: no post defined for this data type.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,6 +76,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~rpcextractor_base() {;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::runtime_error("rpcextractor_base: no post defined for this data type.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -204,6 +208,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,void>::_source->*rpcextractor_base<T,void>::_func)();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,6 +227,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,char>::_source->*rpcextractor_base<T,char>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (static_cast<char>(pmt::to_long(msg)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,6 +246,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,short>::_source->*rpcextractor_base<T,short>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (static_cast<short>(pmt::to_long(msg)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,6 +265,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,double>::_source->*rpcextractor_base<T,double>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_double(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,6 +284,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,float>::_source->*rpcextractor_base<T,float>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_double(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -293,6 +303,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,long>::_source->*rpcextractor_base<T,long>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_long(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,6 +322,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,int>::_source->*rpcextractor_base<T,int>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_long(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,6 +341,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,bool>::_source->*rpcextractor_base<T,bool>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_bool(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -348,6 +361,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::complex<float> k = static_cast<std::complex<float> >(pmt::to_complex(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,std::complex<float> >::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _source->*rpcextractor_base<T,std::complex<float> >::_func)(k);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,6 +382,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,std::complex<double> >::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _source->*rpcextractor_base<T,std::complex<double> >::_func)(pmt::to_complex(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,6 +402,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,std::string>::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _source->*rpcextractor_base<T,std::string>::_func)(pmt::symbol_to_string(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_boost_asio.next.diff b/science/gnuradio/files/patch-fix_boost_asio.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5840b9c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_boost_asio.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/lib/socket_pdu_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/lib/socket_pdu_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,7 +165,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ socket_pdu_impl::start_tcp_accept()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (BOOST_VERSION >= 107000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_acceptor_tcp->async_accept(new_connection->socket(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_includes.next.diff b/science/gnuradio/files/patch-fix_includes.next.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c15729a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix_includes.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,70 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_SOURCE_DIR}/gnuradio-runtime/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_BINARY_DIR}/gnuradio-runtime/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${LOG4CPP_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GR_SET_GLOBAL(GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/apps/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LOG4CPP_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link_directories(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +51,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LOG4CPP_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/swig/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/swig/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LOG4CPP_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link_directories(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-blocks/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-blocks/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-blocks/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-blocks/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +65,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/../include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GR_BLOCKS_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-channels/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-channels/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GR_FILTER_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GR_ANALOG_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_runtime_swigTargets_dest.next.diff b/science/gnuradio/files/patch-fix_runtime_swigTargets_dest.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..73c115c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_runtime_swigTargets_dest.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/swig/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/swig/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(EXPORT runtime_swig-export
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE runtime_swigTargets.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NAMESPACE gnuradio::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${GR_LIBRARY_DIR}/cmake/gnuradio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${GR_CMAKE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_zmq_4.3.1.next.diff b/science/gnuradio/files/patch-fix_zmq_4.3.1.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cbc817f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_zmq_4.3.1.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,316 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/base_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/base_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2016 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2016,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Send */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->send(msg, zmq::send_flags::none);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->send(msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Report back */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return in_nitems;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +190,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_consumed_bytes = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Get the message */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->recv(d_msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->recv(&d_msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Parse header from the first (or only) message of a multi-part message */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (d_pass_tags && !more)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/base_impl.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/base_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2016 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2016,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,9 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCLUDED_ZEROMQ_BASE_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDED_ZEROMQ_BASE_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <zmq.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/sync_block.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "zmq_common_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace zeromq {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/pull_msg_source_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/pull_msg_source_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Receive data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmq::message_t msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->recv(msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->recv(&msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string buf(static_cast<char*>(msg.data()), msg.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::stringbuf sb(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/pull_msg_source_impl.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/pull_msg_source_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDED_ZEROMQ_PULL_MSG_SOURCE_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/zeromq/pull_msg_source.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <zmq.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "zmq_common_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace zeromq {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/rep_msg_sink_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/rep_msg_sink_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +99,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // receive data request
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmq::message_t request;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->recv(request);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->recv(&request);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int req_output_items = *(static_cast<int*>(request.data()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(req_output_items != 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/rep_msg_sink_impl.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/rep_msg_sink_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDED_ZEROMQ_REP_MSG_SINK_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/zeromq/rep_msg_sink.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <zmq.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "zmq_common_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace zeromq {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/rep_sink_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/rep_sink_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Get and parse the request */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmq::message_t request;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->recv(request);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->recv(&request);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nitems_send = noutput_items - done;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (request.size() >= sizeof(uint32_t))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/rep_sink_impl.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/rep_sink_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,8 +24,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDED_ZEROMQ_REP_SINK_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/zeromq/rep_sink.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <zmq.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "base_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/req_msg_source_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/req_msg_source_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +99,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nmsg = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmq::message_t request(sizeof(int));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy((void *) request.data (), &nmsg, sizeof(int));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->send(request, zmq::send_flags::none);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->send(request);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,7 +113,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (items[0].revents & ZMQ_POLLIN) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Receive data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmq::message_t msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->recv(msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->recv(&msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string buf(static_cast<char*>(msg.data()), msg.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::stringbuf sb(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/req_msg_source_impl.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/req_msg_source_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDED_ZEROMQ_REQ_MSG_SOURCE_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/zeromq/req_msg_source.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <zmq.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "zmq_common_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace zeromq {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/sub_msg_source_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/sub_msg_source_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,8 +96,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Receive data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmq::message_t msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_socket->recv(msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_socket->recv(&msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string buf(static_cast<char*>(msg.data()), msg.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::stringbuf sb(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pmt::pmt_t m = pmt::deserialize(sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-zeromq/lib/sub_msg_source_impl.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/sub_msg_source_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2013,2014 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2013,2014,2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDED_ZEROMQ_SUB_MSG_SOURCE_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/zeromq/sub_msg_source.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "zmq.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "zmq_common_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace zeromq {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-zeromq/lib/zmq_common_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* -*- c++ -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright 2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This file is part of GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the Free Software Foundation; either version 3, or (at your option)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * any later version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This software is distributed in the hope that it will be useful,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * GNU General Public License for more details.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * along with this software; see the file COPYING. If not, write to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the Free Software Foundation, Inc., 51 Franklin Street,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Boston, MA 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef INCLUDED_ZEROMQ_ZMQ_COMMON_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define INCLUDED_ZEROMQ_ZMQ_COMMON_IMPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <zmq.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (ZMQ_VERSION) && defined (ZMQ_MAKE_VERSION) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define USE_NEW_ZMQ_SEND_RECV 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define USE_NEW_ZMQ_SEND_RECV 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_NEW_ZMQ_SEND_RECV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#warning "ZMQ using new >= 4.3.1 send/recv!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#warning "ZMQ using old < 4.3.1 send/recv!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* INCLUDED_ZEROMQ_ZMQ_COMMON_IMPL_H */
</span></pre><pre style='margin:0'>
</pre>