From 4512e8ca491c16cdcff68c9c6a585965304acb8e Mon Sep 17 00:00:00 2001 From: Alice Date: Wed, 27 May 2026 11:11:28 +0200 Subject: [PATCH] moved SharedMemory to slsSupportLib --- .../slsDetectorServer_cpp/include/DetectorServer.h | 2 +- slsDetectorSoftware/src/CtbConfig.cpp | 2 +- slsDetectorSoftware/src/DetectorImpl.cpp | 2 +- slsDetectorSoftware/src/DetectorImpl.h | 2 +- slsDetectorSoftware/src/Module.cpp | 2 +- slsDetectorSoftware/src/Module.h | 2 +- slsDetectorSoftware/tests/test-CtbConfig.cpp | 2 +- slsDetectorSoftware/tests/test-Module.cpp | 2 +- slsDetectorSoftware/tests/test-SharedMemory.cpp | 2 +- .../src => slsSupportLib/include/sls}/SharedMemory.h | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename {slsDetectorSoftware/src => slsSupportLib/include/sls}/SharedMemory.h (100%) diff --git a/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.h b/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.h index 5b5ae7759..b77997150 100644 --- a/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.h +++ b/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.h @@ -1,6 +1,6 @@ #pragma once -#include "SharedMemory.h" #include "TCPInterface.h" +#include "sls/SharedMemory.h" #include "sls/logger.h" #include "sls/network_utils.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorSoftware/src/CtbConfig.cpp b/slsDetectorSoftware/src/CtbConfig.cpp index b1117e9ca..2bdb0dafe 100644 --- a/slsDetectorSoftware/src/CtbConfig.cpp +++ b/slsDetectorSoftware/src/CtbConfig.cpp @@ -1,6 +1,6 @@ #include "CtbConfig.h" -#include "SharedMemory.h" +#include "sls/SharedMemory.h" #include "sls/ToString.h" #include "sls/string_utils.h" diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index b83e3a52e..4b09d6afb 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -2,7 +2,7 @@ // Copyright (C) 2021 Contributors to the SLS Detector Package #include "DetectorImpl.h" #include "Module.h" -#include "SharedMemory.h" +#include "sls/SharedMemory.h" #include "sls/ZmqSocket.h" #include "sls/detectorData.h" #include "sls/file_utils.h" diff --git a/slsDetectorSoftware/src/DetectorImpl.h b/slsDetectorSoftware/src/DetectorImpl.h index d7fcc655d..db08d1447 100644 --- a/slsDetectorSoftware/src/DetectorImpl.h +++ b/slsDetectorSoftware/src/DetectorImpl.h @@ -3,8 +3,8 @@ #pragma once #include "CtbConfig.h" -#include "SharedMemory.h" #include "sls/Result.h" +#include "sls/SharedMemory.h" #include "sls/ZmqSocket.h" #include "sls/logger.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 17fe8841b..9d0dc0462 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: LGPL-3.0-or-other // Copyright (C) 2021 Contributors to the SLS Detector Package #include "Module.h" -#include "SharedMemory.h" #include "sls/ClientSocket.h" +#include "sls/SharedMemory.h" #include "sls/ToString.h" #include "sls/Version.h" #include "sls/bit_utils.h" diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index cf4672c93..6d8d20282 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -1,9 +1,9 @@ // SPDX-License-Identifier: LGPL-3.0-or-other // Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once -#include "SharedMemory.h" #include "sls/ClientSocket.h" #include "sls/Pattern.h" +#include "sls/SharedMemory.h" #include "sls/StaticVector.h" #include "sls/bit_utils.h" #include "sls/logger.h" diff --git a/slsDetectorSoftware/tests/test-CtbConfig.cpp b/slsDetectorSoftware/tests/test-CtbConfig.cpp index 5aaffeb3e..84c904c5e 100644 --- a/slsDetectorSoftware/tests/test-CtbConfig.cpp +++ b/slsDetectorSoftware/tests/test-CtbConfig.cpp @@ -4,7 +4,7 @@ #include #include "CtbConfig.h" -#include "SharedMemory.h" +#include "sls/SharedMemory.h" #include #include diff --git a/slsDetectorSoftware/tests/test-Module.cpp b/slsDetectorSoftware/tests/test-Module.cpp index 39d9ef568..779f3ea34 100644 --- a/slsDetectorSoftware/tests/test-Module.cpp +++ b/slsDetectorSoftware/tests/test-Module.cpp @@ -2,8 +2,8 @@ // Copyright (C) 2021 Contributors to the SLS Detector Package #include "Detector.h" #include "Module.h" -#include "SharedMemory.h" #include "catch.hpp" +#include "sls/SharedMemory.h" namespace sls { diff --git a/slsDetectorSoftware/tests/test-SharedMemory.cpp b/slsDetectorSoftware/tests/test-SharedMemory.cpp index d8a1efb16..324205acf 100644 --- a/slsDetectorSoftware/tests/test-SharedMemory.cpp +++ b/slsDetectorSoftware/tests/test-SharedMemory.cpp @@ -2,8 +2,8 @@ // Copyright (C) 2021 Contributors to the SLS Detector Package #define DISABLE_STATIC_ASSERT // to be able to test obsolete shm without isValid -#include "SharedMemory.h" #include "catch.hpp" +#include "sls/SharedMemory.h" #include "sls/string_utils.h" #include diff --git a/slsDetectorSoftware/src/SharedMemory.h b/slsSupportLib/include/sls/SharedMemory.h similarity index 100% rename from slsDetectorSoftware/src/SharedMemory.h rename to slsSupportLib/include/sls/SharedMemory.h