[Commit-gnuradio] [gnuradio] 03/05: gr-zmq: Fix build with gcc6.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 02e01d33084614dccebffed533dce1c05477902d
Author: Philip Balister <address@hidden>
Date:   Tue Jun 28 10:26:22 2016 -0400

    gr-zmq: Fix build with gcc6.
    
    Signed-off-by: Philip Balister <address@hidden>
---
 gr-zeromq/lib/base_impl.cc            | 2 +-
 gr-zeromq/lib/pull_msg_source_impl.cc | 2 +-
 gr-zeromq/lib/push_sink_impl.cc       | 2 +-
 gr-zeromq/lib/rep_msg_sink_impl.cc    | 2 +-
 gr-zeromq/lib/rep_sink_impl.cc        | 2 +-
 gr-zeromq/lib/req_msg_source_impl.cc  | 4 ++--
 gr-zeromq/lib/sub_msg_source_impl.cc  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gr-zeromq/lib/base_impl.cc b/gr-zeromq/lib/base_impl.cc
index f41e5cb..f33315d 100644
--- a/gr-zeromq/lib/base_impl.cc
+++ b/gr-zeromq/lib/base_impl.cc
@@ -159,7 +159,7 @@ namespace gr {
     base_source_impl::load_message(bool wait)
     {
       /* Poll for input */
-      zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+      zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLIN, 0 } };
       zmq::poll(&items[0], 1, wait ? d_timeout : 0);
 
       if (!(items[0].revents & ZMQ_POLLIN))
diff --git a/gr-zeromq/lib/pull_msg_source_impl.cc 
b/gr-zeromq/lib/pull_msg_source_impl.cc
index 9d00cdf..bd84c9f 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.cc
+++ b/gr-zeromq/lib/pull_msg_source_impl.cc
@@ -88,7 +88,7 @@ namespace gr {
     {
       while(!d_finished){
 
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLIN, 0 } };
         zmq::poll (&items[0], 1, d_timeout);
 
         //  If we got a reply, process
diff --git a/gr-zeromq/lib/push_sink_impl.cc b/gr-zeromq/lib/push_sink_impl.cc
index a5aec2c..5f9670e 100644
--- a/gr-zeromq/lib/push_sink_impl.cc
+++ b/gr-zeromq/lib/push_sink_impl.cc
@@ -53,7 +53,7 @@ namespace gr {
                          gr_vector_void_star &output_items)
     {
       // Poll with a timeout (FIXME: scheduler can't wait for us)
-      zmq::pollitem_t itemsout[] = { { *d_socket, 0, ZMQ_POLLOUT, 0 } };
+      zmq::pollitem_t itemsout[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLOUT, 0 } };
       zmq::poll(&itemsout[0], 1, d_timeout);
 
       // If we can send something, do it
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.cc 
b/gr-zeromq/lib/rep_msg_sink_impl.cc
index be86f83..b88e62b 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.cc
+++ b/gr-zeromq/lib/rep_msg_sink_impl.cc
@@ -90,7 +90,7 @@ namespace gr {
         while(!empty_p(pmt::mp("in"))) {
 
           // wait for query...
-          zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+          zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLIN, 0 } };
           zmq::poll (&items[0], 1, d_timeout);
 
           //  If we got a reply, process
diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc
index ac6fc9c..0303f65 100644
--- a/gr-zeromq/lib/rep_sink_impl.cc
+++ b/gr-zeromq/lib/rep_sink_impl.cc
@@ -62,7 +62,7 @@ namespace gr {
         /* Wait for a small time (FIXME: scheduler can't wait for us) */
           /* We only wait if its the first iteration, for the others we'll
            * let the scheduler retry */
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLIN, 0 } };
         zmq::poll(&items[0], 1, first ? d_timeout : 0);
 
           /* If we dont have anything, we're done */
diff --git a/gr-zeromq/lib/req_msg_source_impl.cc 
b/gr-zeromq/lib/req_msg_source_impl.cc
index e231a31..7d9f0f3 100644
--- a/gr-zeromq/lib/req_msg_source_impl.cc
+++ b/gr-zeromq/lib/req_msg_source_impl.cc
@@ -89,7 +89,7 @@ namespace gr {
       while(!d_finished){
         //std::cout << "readloop\n";
 
-        zmq::pollitem_t itemsout[] = { { *d_socket, 0, ZMQ_POLLOUT, 0 } };
+        zmq::pollitem_t itemsout[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLOUT, 0 } };
         zmq::poll(&itemsout[0], 1, d_timeout);
 
         //  If we got a reply, process
@@ -101,7 +101,7 @@ namespace gr {
           d_socket->send(request);
         }
 
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLIN, 0 } };
         zmq::poll (&items[0], 1, d_timeout);
 
         //  If we got a reply, process
diff --git a/gr-zeromq/lib/sub_msg_source_impl.cc 
b/gr-zeromq/lib/sub_msg_source_impl.cc
index 0a11ea7..4a44442 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.cc
+++ b/gr-zeromq/lib/sub_msg_source_impl.cc
@@ -87,7 +87,7 @@ namespace gr {
     {
       while(!d_finished){
 
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, 
ZMQ_POLLIN, 0 } };
         zmq::poll(&items[0], 1, d_timeout);
 
         //  If we got a reply, process