detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

warning

Browse Source
This commit is contained in:
Erik Frojdh
2019-02-08 14:03:49 +01:00
parent cd738106ec
commit 0ef030354f
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/GeneralData.h
View File

@ -155,7 +155,7 @@ public:
* @param i pointer to a vector of ROI pointers
* @returns adc configured
*/
virtual const int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{
virtual int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
return 0;
};
@ -345,7 +345,7 @@ private:
* @param i pointer to a vector of ROI
* @returns adc configured
*/
const int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{
int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{
int adc = -1;
// single adc
if(i->size()) {

2
slsReceiverSoftware/include/logger.h
View File

@ -115,7 +115,7 @@ inline std::string NowTime()
const int buffer_len = sizeof(buffer);
time_t t;
time(&t);
tm r = {0};
tm r = {};
strftime(buffer, buffer_len, "%X", localtime_r(&t, &r));
buffer[buffer_len - 1] = 0;
struct timeval tv;