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

View File

@ -115,6 +115,13 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
/** function not implemented for specific detector */
void functionNotImplemented();
/** mode not implemented for specific detector */
void modeNotImplemented(std::string modename, int mode);
/** validate and set error */
template <typename T>
void validate(T arg, T retval, std::string modename, bool hex);
/** Unrecognized Function */
int M_nofunc();

View File

@ -144,9 +144,9 @@ int slsReceiverImplementation::getDetectorPositionId() const{
return detID;
}
char *slsReceiverImplementation::getDetectorHostname() const{
std::string slsReceiverImplementation::getDetectorHostname() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return detHostname;
return std::string(detHostname);
}
int slsReceiverImplementation::getFlippedData(int axis) const{
@ -167,14 +167,14 @@ slsDetectorDefs::fileFormat slsReceiverImplementation::getFileFormat() const{
}
char *slsReceiverImplementation::getFileName() const{
std::string slsReceiverImplementation::getFileName() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return fileName;
return std::string(fileName);
}
char *slsReceiverImplementation::getFilePath() const{
std::string slsReceiverImplementation::getFilePath() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return filePath;
return std::string(filePath);
}
uint64_t slsReceiverImplementation::getFileIndex() const{
@ -270,9 +270,9 @@ uint32_t slsReceiverImplementation::getUDPPortNumber2() const{
return udpPortNum[1];
}
char *slsReceiverImplementation::getEthernetInterface() const{
std::string slsReceiverImplementation::getEthernetInterface() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return eth;
return std::string(eth);
}
@ -367,14 +367,14 @@ uint32_t slsReceiverImplementation::getStreamingPort() const{
return streamingPort;
}
char *slsReceiverImplementation::getStreamingSourceIP() const{
std::string slsReceiverImplementation::getStreamingSourceIP() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return streamingSrcIP;
return std::string(streamingSrcIP);
}
char *slsReceiverImplementation::getAdditionalJsonHeader() const{
std::string slsReceiverImplementation::getAdditionalJsonHeader() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return additionalJsonHeader;
return std::string(additionalJsonHeader);
}
uint32_t slsReceiverImplementation::getUDPSocketBufferSize() const {

File diff suppressed because it is too large Load Diff