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

Merge branch '4.0.0' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.0

Browse Source
This commit is contained in:
maliakal_d 2018-09-25 13:55:42 +02:00
commit cab9dff225
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -610,7 +610,7 @@ slsDetector* multiSlsDetector::getSlsDetector(unsigned int pos) {
return 0; return 0;
} }
slsDetector *multiSlsDetector::operator()(int pos) { slsDetector *multiSlsDetector::operator()(int pos) const {
if (pos >= 0 && pos < (int)detectors.size()) if (pos >= 0 && pos < (int)detectors.size())
return detectors[pos]; return detectors[pos];
return NULL; return NULL;

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -491,7 +491,7 @@ public:
* @param pos position in the multi list * @param pos position in the multi list
* @returns slsDetector object * @returns slsDetector object
*/ */
slsDetector *operator()(int pos); slsDetector *operator()(int pos) const;
/** /**
* Free shared memory from the command line * Free shared memory from the command line