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

bugfix: returning pointer to local variable, char* to string in function definition

Browse Source
This commit is contained in:
maliakal_d
2018-02-07 10:14:52 +01:00
parent 618f6291cf
commit ecf1e9fac1
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -4067,7 +4067,7 @@ slsDetectorDefs::externalSignalFlag multiSlsDetector::setExternalSignalFlags(ext
const char * multiSlsDetector::getSettingsFile() {
string multiSlsDetector::getSettingsFile() {
string s0="", s1="",s ;
@@ -4088,9 +4088,9 @@ const char * multiSlsDetector::getSettingsFile() {
}
}
if (s1=="bad")
return s0.c_str();
return s0;
else
return s1.c_str();
return s1;
}

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -505,7 +505,7 @@ class multiSlsDetector : public slsDetectorUtils {
int64_t getId(idMode mode, int imod=0);
int digitalTest(digitalTestMode mode, int imod=0);
int executeTrimming(trimMode mode, int par1, int par2, int imod=-1);
const char *getSettingsFile();
string getSettingsFile();
int decodeNMod(int i, int &idet, int &imod);