detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

solved merge conflict in changes to use ZmqSocket.h externally

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-23 16:35:31 +01:00
commit 2c276db579
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -10,6 +10,7 @@
#include "ansi.h" #include "ansi.h"
#include <iostream>
#include <zmq.h> #include <zmq.h>
#include <errno.h> #include <errno.h>
#include <netdb.h> //gethostbyname() #include <netdb.h> //gethostbyname()
@ -225,7 +226,7 @@ public:
return 0; return 0;
} }
} }
cerr << "Error: Could not convert hostname to internet address" << endl; cprintf(RED, "Error: Could not convert hostname to internet address\n");
return 1; return 1;
}; };
@ -243,7 +244,7 @@ public:
freeaddrinfo(res); freeaddrinfo(res);
return 0; return 0;
} }
cerr << "Error: Could not convert internet address to ip string" << endl; cprintf(RED, "Error: Could not convert internet address to ip string\n");
return 1; return 1;
} }