From 7314c52c63b1aa24ca843a7687f8fceb29881c7d Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 14 May 2019 17:32:21 +0200 Subject: [PATCH] removed unneccecary includes --- slsDetectorSoftware/include/slsDetector.h | 2 -- slsDetectorSoftware/src/slsDetector.cpp | 1 - slsSupportLib/include/ClientInterface.h | 1 - slsSupportLib/src/ClientInterface.cpp | 1 + slsSupportLib/tests/test-ClientInterface.cpp | 1 - slsSupportLib/tests/test-string_utils.cpp | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/slsDetectorSoftware/include/slsDetector.h b/slsDetectorSoftware/include/slsDetector.h index 3fc4c5d73..7dcc0cd87 100755 --- a/slsDetectorSoftware/include/slsDetector.h +++ b/slsDetectorSoftware/include/slsDetector.h @@ -2,7 +2,6 @@ #include "ClientSocket.h" #include "SharedMemory.h" -// #include "error_defs.h" #include "logger.h" #include "sls_detector_defs.h" #include "network_utils.h" @@ -16,7 +15,6 @@ class ClientInterface; class multiSlsDetector; class ServerInterface; -class MySocketTCP; #define SLS_SHMVERSION 0x190503 #define MAX_RX_DBIT 64 diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp index 606d0e772..4b667ef6d 100755 --- a/slsDetectorSoftware/src/slsDetector.cpp +++ b/slsDetectorSoftware/src/slsDetector.cpp @@ -1,7 +1,6 @@ #include "slsDetector.h" #include "ClientInterface.h" #include "ClientSocket.h" -#include "MySocketTCP.h" #include "ServerInterface.h" #include "SharedMemory.h" #include "file_utils.h" diff --git a/slsSupportLib/include/ClientInterface.h b/slsSupportLib/include/ClientInterface.h index 379d10bd6..19f3cd5e3 100755 --- a/slsSupportLib/include/ClientInterface.h +++ b/slsSupportLib/include/ClientInterface.h @@ -2,7 +2,6 @@ #include "sls_detector_defs.h" -#include "MySocketTCP.h" #include "ClientSocket.h" diff --git a/slsSupportLib/src/ClientInterface.cpp b/slsSupportLib/src/ClientInterface.cpp index a09ff6002..2d5a3c2fb 100755 --- a/slsSupportLib/src/ClientInterface.cpp +++ b/slsSupportLib/src/ClientInterface.cpp @@ -1,5 +1,6 @@ #include "ClientInterface.h" #include "ClientSocket.h" +#include ClientInterface::ClientInterface(sls::ClientSocket *socket, int n) : socket_(socket){} diff --git a/slsSupportLib/tests/test-ClientInterface.cpp b/slsSupportLib/tests/test-ClientInterface.cpp index 633e8a0f9..831ca51e8 100755 --- a/slsSupportLib/tests/test-ClientInterface.cpp +++ b/slsSupportLib/tests/test-ClientInterface.cpp @@ -1,5 +1,4 @@ #include "ClientInterface.h" -#include "MySocketTCP.h" #include "catch.hpp" //tests to add diff --git a/slsSupportLib/tests/test-string_utils.cpp b/slsSupportLib/tests/test-string_utils.cpp index efbf99b76..d31a7fbc2 100755 --- a/slsSupportLib/tests/test-string_utils.cpp +++ b/slsSupportLib/tests/test-string_utils.cpp @@ -1,4 +1,3 @@ -#include "MySocketTCP.h" #include "catch.hpp" #include "logger.h" #include