From 24fc5de58d0bd206f773d8ecb6fca7e5b122f6da Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 14 May 2019 17:34:51 +0200 Subject: [PATCH] clang-tidy header include order --- slsDetectorSoftware/src/multiSlsDetector.cpp | 2 +- slsReceiverSoftware/src/BinaryFile.cpp | 2 +- slsReceiverSoftware/src/DataProcessor.cpp | 4 ++-- slsReceiverSoftware/src/DataStreamer.cpp | 2 +- slsReceiverSoftware/src/Fifo.cpp | 2 +- slsReceiverSoftware/src/Listener.cpp | 4 ++-- slsReceiverSoftware/src/main.cpp | 4 ++-- slsReceiverSoftware/src/slsReceiver.cpp | 2 +- slsReceiverSoftware/src/slsReceiverImplementation.cpp | 4 ++-- slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 4 ++-- slsSupportLib/src/ServerSocket.cpp | 2 +- slsSupportLib/tests/test-Sockets.cpp | 2 +- slsSupportLib/tests/test-network_utils.cpp | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp index a227fb1eb..6da911c14 100755 --- a/slsDetectorSoftware/src/multiSlsDetector.cpp +++ b/slsDetectorSoftware/src/multiSlsDetector.cpp @@ -12,8 +12,8 @@ #include "container_utils.h" -#include "string_utils.h" #include "network_utils.h" +#include "string_utils.h" #include #include diff --git a/slsReceiverSoftware/src/BinaryFile.cpp b/slsReceiverSoftware/src/BinaryFile.cpp index 2ad806e86..6b9ec97e9 100755 --- a/slsReceiverSoftware/src/BinaryFile.cpp +++ b/slsReceiverSoftware/src/BinaryFile.cpp @@ -5,8 +5,8 @@ ***********************************************/ #include "BinaryFile.h" -#include "receiver_defs.h" #include "Fifo.h" +#include "receiver_defs.h" #include diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index a33ffd06a..1b5721083 100755 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -7,9 +7,9 @@ #include "DataProcessor.h" -#include "GeneralData.h" -#include "Fifo.h" #include "BinaryFile.h" +#include "Fifo.h" +#include "GeneralData.h" #ifdef HDF5C #include "HDF5File.h" #endif diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp index 8a1fe7120..ca8c9c59c 100755 --- a/slsReceiverSoftware/src/DataStreamer.cpp +++ b/slsReceiverSoftware/src/DataStreamer.cpp @@ -5,8 +5,8 @@ #include "DataStreamer.h" -#include "GeneralData.h" #include "Fifo.h" +#include "GeneralData.h" #include "ZmqSocket.h" #include "sls_detector_exceptions.h" diff --git a/slsReceiverSoftware/src/Fifo.cpp b/slsReceiverSoftware/src/Fifo.cpp index 74c90c7a3..9e744a0d7 100755 --- a/slsReceiverSoftware/src/Fifo.cpp +++ b/slsReceiverSoftware/src/Fifo.cpp @@ -8,9 +8,9 @@ #include "Fifo.h" #include "sls_detector_exceptions.h" -#include #include #include +#include Fifo::Fifo(int ind, uint32_t fifoItemSize, uint32_t depth): diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 59b308de9..8760d6dba 100755 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -7,10 +7,10 @@ #include "Listener.h" -#include "GeneralData.h" #include "Fifo.h" -#include "genericSocket.h" +#include "GeneralData.h" #include "container_utils.h" // For sls::make_unique<> +#include "genericSocket.h" #include "sls_detector_exceptions.h" #include diff --git a/slsReceiverSoftware/src/main.cpp b/slsReceiverSoftware/src/main.cpp index 9c5331a94..c2fbd0194 100755 --- a/slsReceiverSoftware/src/main.cpp +++ b/slsReceiverSoftware/src/main.cpp @@ -1,9 +1,9 @@ /* A simple server in the internet domain using TCP The port number is passed as an argument */ -#include "sls_detector_defs.h" -#include "slsReceiverUsers.h" #include "logger.h" +#include "slsReceiverUsers.h" +#include "sls_detector_defs.h" #include //SIGINT #include //system diff --git a/slsReceiverSoftware/src/slsReceiver.cpp b/slsReceiverSoftware/src/slsReceiver.cpp index eb84ab4df..9be63de83 100755 --- a/slsReceiverSoftware/src/slsReceiver.cpp +++ b/slsReceiverSoftware/src/slsReceiver.cpp @@ -13,11 +13,11 @@ #include "container_utils.h" // For sls::make_unique<> +#include "logger.h" #include "slsReceiver.h" #include "slsReceiverTCPIPInterface.h" #include "sls_detector_exceptions.h" #include "versionAPI.h" -#include "logger.h" slsReceiver::slsReceiver(int argc, char *argv[]): tcpipInterface (nullptr) { diff --git a/slsReceiverSoftware/src/slsReceiverImplementation.cpp b/slsReceiverSoftware/src/slsReceiverImplementation.cpp index 19be8d463..ca1a91da0 100755 --- a/slsReceiverSoftware/src/slsReceiverImplementation.cpp +++ b/slsReceiverSoftware/src/slsReceiverImplementation.cpp @@ -5,11 +5,11 @@ #include "slsReceiverImplementation.h" -#include "GeneralData.h" -#include "Listener.h" #include "DataProcessor.h" #include "DataStreamer.h" #include "Fifo.h" +#include "GeneralData.h" +#include "Listener.h" #include "ZmqSocket.h" //just for the zmq port define #include //eperm diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 29b3fe485..28a2f820f 100755 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -4,11 +4,11 @@ ***********************************************/ #include "slsReceiverTCPIPInterface.h" -#include "slsReceiverImplementation.h" #include "MySocketTCP.h" #include "ServerInterface.h" -#include "slsReceiverUsers.h" #include "slsReceiver.h" +#include "slsReceiverImplementation.h" +#include "slsReceiverUsers.h" #include "versionAPI.h" #include diff --git a/slsSupportLib/src/ServerSocket.cpp b/slsSupportLib/src/ServerSocket.cpp index 54943cc79..0876c212c 100755 --- a/slsSupportLib/src/ServerSocket.cpp +++ b/slsSupportLib/src/ServerSocket.cpp @@ -6,10 +6,10 @@ #include "string_utils.h" #include +#include #include #include #include -#include #define DEFAULT_PACKET_SIZE 1286 #define SOCKET_BUFFER_SIZE (100 * 1024 * 1024) // 100 MB #define DEFAULT_BACKLOG 5 diff --git a/slsSupportLib/tests/test-Sockets.cpp b/slsSupportLib/tests/test-Sockets.cpp index 8726c2515..dae1fd6af 100644 --- a/slsSupportLib/tests/test-Sockets.cpp +++ b/slsSupportLib/tests/test-Sockets.cpp @@ -1,9 +1,9 @@ #include "ClientSocket.h" #include "ServerSocket.h" #include "catch.hpp" +#include #include #include -#include std::vector server() { std::cout << "starting server\n"; diff --git a/slsSupportLib/tests/test-network_utils.cpp b/slsSupportLib/tests/test-network_utils.cpp index 41e422812..c9457da4f 100755 --- a/slsSupportLib/tests/test-network_utils.cpp +++ b/slsSupportLib/tests/test-network_utils.cpp @@ -4,8 +4,8 @@ #include #include -#include "string_utils.h" #include "sls_detector_exceptions.h" +#include "string_utils.h" using namespace sls;