compiles, but doesnt run

This commit is contained in:
2018-10-29 15:23:52 +01:00
parent 33ac63d14a
commit 92fc837eb4
11 changed files with 1034 additions and 1286 deletions

View File

@ -57,7 +57,7 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get detector hostname
* @return hostname (max of 1000 characters)
*/
char *getDetectorHostname() const;
std::string getDetectorHostname() const;
/*
* Get flipped data across 'axis'
@ -82,13 +82,13 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get File Name Prefix (without frame index, file index and extension (_d0_f000000000000_8.raw))
* @return file name prefix
*/
char *getFileName() const;
std::string getFileName() const;
/**
* Get File Path
* @return file path
*/
char *getFilePath() const;
std::string getFilePath() const;
/**
* Get File Index
@ -164,7 +164,7 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get Ehernet Interface
* @ethernet interface. eg. eth0 or "" if listening to all
*/
char *getEthernetInterface() const;
std::string getEthernetInterface() const;
//***acquisition parameters***
@ -288,13 +288,13 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get streaming source ip
* @return streaming source ip
*/
char *getStreamingSourceIP() const;
std::string getStreamingSourceIP() const;
/**
* Get additional json header
* @return additional json header
*/
char *getAdditionalJsonHeader() const;
std::string getAdditionalJsonHeader() const;
/** (not saved in client shared memory)
* Get UDP Socket Buffer Size