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

Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences

Browse Source
This commit is contained in:
maliakal_d
2018-08-08 15:43:29 +02:00
parent f1333c7a90
commit ab7e63c20f
10 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/sharedMemory/SharedMemory.cpp
View File

@ -1,5 +1,5 @@
#include "SharedMemory.h"
#include "sls_detector_exceptions.h"
#include "sls_receiver_exceptions.h"
#include "ansi.h"
#include <iostream>
@ -122,14 +122,14 @@ void* SharedMemory::MapSharedMemory(size_t sz) {
std::string SharedMemory::ConstructSharedMemoryName(int multiId, int slsId) {
// using environment path
string sEnvPath = "";
std::string sEnvPath = "";
char* envpath = getenv(SHM_ENV_NAME);
if (envpath != NULL) {
sEnvPath.assign(envpath);
sEnvPath.insert(0,"_");
}
stringstream ss;
std::stringstream ss;
if (slsId < 0)
ss << SHM_MULTI_PREFIX << multiId << sEnvPath;
else