detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-21 10:24:32 +01:00
Code Issues Actions Packages Releases Activity

merge conflict from 3.0.1

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 11:35:15 +01:00
parent db2fef5d69 823d537825
commit 1dee950870
7 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/include/ZmqSocket.h
View File

@@ -8,9 +8,7 @@
*/
#include "ansi.h"
#include "sls_receiver_defs.h"
//#define ZMQ_DETAIL
#include <zmq.h>
#include <errno.h>
@@ -21,7 +19,8 @@
#include <unistd.h> //usleep in some machines
using namespace rapidjson;
#define DEFAULT_ZMQ_PORTNO 30001
//#define ZMQ_DETAIL
class ZmqSocket {