detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 15:27:13 +02:00
Code Issues Actions Packages Releases Activity

move constructor deleted copy constructor

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-12 14:37:06 +01:00
parent 48e4cec56f
commit d4e4fb8ffe
6 changed files with 104 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -31,7 +31,7 @@ slsDetector::slsDetector(detectorType type, int multiId, int id, bool verify)
* so sls shared memory will be created */
// ensure shared memory was not created before
auto shm = SharedMemory<sharedSlsDetector>(multiId, id);
SharedMemory<sharedSlsDetector> shm(multiId, id);
if (shm.IsExisting()) {
FILE_LOG(logWARNING) << "This shared memory should have been "
"deleted before! "
@ -202,7 +202,7 @@ int64_t slsDetector::getId(idMode mode) {
}
void slsDetector::freeSharedMemory(int multiId, int slsId) {
auto shm = SharedMemory<sharedSlsDetector>(multiId, slsId);
SharedMemory<sharedSlsDetector> shm(multiId, slsId);
shm.RemoveSharedMemory();
}
@ -640,7 +640,7 @@ int slsDetector::receiveModule(sls_detector_module *myMod) {
}
slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, bool verify) {
auto shm = SharedMemory<sharedSlsDetector>(multiId, detId);
SharedMemory<sharedSlsDetector> shm(multiId, detId);
if (!shm.IsExisting()) {
FILE_LOG(logERROR) << "Shared memory " << shm.GetName() << " does not exist.\n"
"Corrupted Multi Shared memory. Please free shared memory.";