merge resolved

This commit is contained in:
2019-08-21 14:25:21 +02:00
31 changed files with 600 additions and 207 deletions

View File

@ -21,6 +21,7 @@ class DataStreamer;
class Fifo;
class slsDetectorDefs;
#include <atomic>
#include <exception>
#include <memory>
#include <vector>
@ -910,7 +911,7 @@ class slsReceiverImplementation : private virtual slsDetectorDefs {
/** Maximum Number of Listening Threads/ UDP Ports */
const static int MAX_NUMBER_OF_LISTENING_THREADS = 2;
/** Receiver Status */
runStatus status;
std::atomic<runStatus> status;
/** Activated/Deactivated */
bool activated;
/** Deactivated padding enable */