merging refactor (replacing)

This commit is contained in:
2019-04-12 10:53:09 +02:00
parent 0bb800cc8a
commit 89a06f099c
1176 changed files with 82698 additions and 159058 deletions

4
slsReceiverSoftware/include/ThreadObject.h Normal file → Executable file
View File

@ -7,14 +7,14 @@
*@short creates/destroys a thread
*/
#include "sls_receiver_defs.h"
#include "sls_detector_defs.h"
#include "logger.h"
#include <pthread.h>
#include <semaphore.h>
#include <string>
class ThreadObject : private virtual slsReceiverDefs {
class ThreadObject : private virtual slsDetectorDefs {
public:
/**