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

moving SharedMemory into namespace sls

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-14 16:51:38 +01:00
parent 40d2f66146
commit bad44f5bf4
6 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -26,6 +26,9 @@
#include <future>
#include <vector>
using sls::SharedMemory;
using sls::SharedMemoryError;
multiSlsDetector::multiSlsDetector(int id, bool verify, bool update)
: detId(id) {
setupMultiDetector(verify, update);

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1959,7 +1959,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
int detId;
/** Shared Memory object */
SharedMemory<sharedMultiSlsDetector> multi_shm{0, -1};
sls::SharedMemory<sharedMultiSlsDetector> multi_shm{0, -1};
/** pointers to the slsDetector structures */
std::vector<std::unique_ptr<slsDetector>> detectors;