generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-04-21 00:11:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39 from zbierak/master

Browse Source 
Fixes backward compatibility with zmq 3.x
This commit is contained in:
Pieter Hintjens 2014-08-08 11:58:43 +02:00
commit 96e05769d2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zmq.hpp
View File

@ -492,11 +492,15 @@ namespace zmq
if (rc == -1 && zmq_errno() == ETERM) if (rc == -1 && zmq_errno() == ETERM)
break; break;
assert (rc != -1); assert (rc != -1);
#if ZMQ_VERSION_MAJOR >= 4
const char* data = static_cast<const char*>(zmq_msg_data(&eventMsg)); const char* data = static_cast<const char*>(zmq_msg_data(&eventMsg));
zmq_event_t msgEvent; zmq_event_t msgEvent;
msgEvent.event = *(uint16_t*)data; data += sizeof(uint16_t); msgEvent.event = *(uint16_t*)data; data += sizeof(uint16_t);
msgEvent.value = *(int32_t*)data; msgEvent.value = *(int32_t*)data;
zmq_event_t* event = &msgEvent; zmq_event_t* event = &msgEvent;
#else
zmq_event_t* event = static_cast<zmq_event_t*>(zmq_msg_data(&eventMsg));
#endif
#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT #ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT
zmq_msg_t addrMsg; zmq_msg_t addrMsg;