← Back to branch summary

~tes/goby/2.1-git

« back to all changes in this revision

Viewing changes to src/common/zeromq_service.cpp

  • Committer: GitHub
  • Author(s): Toby Schneider
  • Date: 2018-02-23 20:01:19 UTC
  • mfrom: (664.1.9)
  • Revision ID: git-v1:1fbd27d19635a7d4dcd13fb96925728b893be2ad
Merge pull request #31 from GobySoft/2.1-iver-driver

2.1 iver driver

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/zeromq_service.cpp
75
75
            sockets_.insert(std::make_pair(cfg.socket(i).socket_id(), ZeroMQSocket(new_socket)));
76
76
            
77
77
            //  Initialize poll set
78
 
            zmq::pollitem_t item = { *new_socket, 0, ZMQ_POLLIN, 0 };
 
78
            zmq::pollitem_t item = { (void*)*new_socket, 0, ZMQ_POLLIN, 0 };
79
79
 
80
80
            // publish sockets can't receive
81
81
            if(cfg.socket(i).socket_type() != protobuf::ZeroMQServiceConfig::Socket::PUBLISH)