detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 23:55:52 +01: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

6
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -24,6 +24,10 @@
#include <sys/types.h>
#include <cassert>
using sls::SharedMemory;
using sls::SharedMemoryError;
using sls::RuntimeError;
#define DEFAULT_HOSTNAME "localhost"
slsDetector::slsDetector(detectorType type, int multiId, int id, bool verify)
@@ -290,7 +294,7 @@ void slsDetector::setDetectorSpecificParameters(detectorType type, detParameterL
break;
default:
FILE_LOG(logERROR) << "Unknown detector type! " << type;
throw std::exception();
throw RuntimeError("Unknown detector type");
}
}

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -1736,7 +1736,7 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
int detId;
/** Shared Memory object */
SharedMemory<sharedSlsDetector> detector_shm{0,0};
sls::SharedMemory<sharedSlsDetector> detector_shm{0,0};
};