diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index a773ec868..cd9f77b0d 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -244,7 +244,7 @@ void multiSlsDetector::freeSharedMemory(int multiId, int detPos) { return; } - // multi + // multi - get number of detectors from shm SharedMemory multiShm(multiId, -1); int numDetectors = 0; @@ -276,7 +276,7 @@ void multiSlsDetector::freeSharedMemory(int detPos) { detectors.clear(); // clear multi detector shm - sharedMemory.RemoveSharedMemory(); //TODO verify use + sharedMemory.RemoveSharedMemory(); client_downstream = false; } diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index 14e2b1d6f..310113574 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -12,7 +12,6 @@ #include "logger.h" #include "sls_detector_defs.h" class slsDetector; -// class SharedMemory; class ZmqSocket; class detectorData; diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 179882e62..e5225b0b3 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -240,13 +240,11 @@ void slsDetector::initSharedMemory(bool created, detectorType type, int multiId, // create if (created) { - // thisDetector = (sharedSlsDetector *)sharedMemory->CreateSharedMemory(sz); sharedMemory->CreateSharedMemory(sz); thisDetector = (*sharedMemory)(); } // open and verify version else { - // thisDetector = (sharedSlsDetector *)sharedMemory->OpenSharedMemory(sz); sharedMemory->OpenSharedMemory(sz); thisDetector = (*sharedMemory)(); if (verify && thisDetector->shmversion != SLS_SHMVERSION) { @@ -648,7 +646,6 @@ slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, b } // open, map, verify version - // auto sdet = (sharedSlsDetector *)shm.OpenSharedMemory(sz); shm.OpenSharedMemory(); auto sdet = shm(); if (verify && sdet->shmversion != SLS_SHMVERSION) { diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index 346db690c..14bb12ff1 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -19,7 +19,6 @@ class ClientInterface; #include class multiSlsDetector; -// class SharedMemory; class ServerInterface; class MySocketTCP;