Reorganize includes for consistency

This commit is contained in:
Dennis Klein 2021-03-24 11:12:49 +01:00 committed by Dennis Klein
parent 68ceaba501
commit 107248be0a
11 changed files with 19 additions and 21 deletions

View File

@ -9,17 +9,17 @@
#ifndef FAIRMQDEVICE_H_ #ifndef FAIRMQDEVICE_H_
#define FAIRMQDEVICE_H_ #define FAIRMQDEVICE_H_
#include <StateMachine.h>
#include <FairMQTransportFactory.h>
#include <fairmq/Transports.h>
#include <fairmq/StateQueue.h>
#include <FairMQChannel.h> #include <FairMQChannel.h>
#include <FairMQLogger.h>
#include <FairMQMessage.h> #include <FairMQMessage.h>
#include <FairMQParts.h> #include <FairMQParts.h>
#include <FairMQTransportFactory.h>
#include <FairMQUnmanagedRegion.h> #include <FairMQUnmanagedRegion.h>
#include <FairMQLogger.h>
#include <fairmq/ProgOptions.h> #include <fairmq/ProgOptions.h>
#include <fairmq/StateMachine.h>
#include <fairmq/StateQueue.h>
#include <fairmq/Transports.h>
#include <fairmq/tools/Version.h>
#include <vector> #include <vector>
#include <memory> // unique_ptr #include <memory> // unique_ptr
@ -34,8 +34,6 @@
#include <cstddef> #include <cstddef>
#include <utility> // pair #include <utility> // pair
#include <fairmq/tools/Version.h>
using FairMQChannelMap = std::unordered_map<std::string, std::vector<FairMQChannel>>; using FairMQChannelMap = std::unordered_map<std::string, std::vector<FairMQChannel>>;
using InputMsgCallback = std::function<bool(FairMQMessagePtr&, int)>; using InputMsgCallback = std::function<bool(FairMQMessagePtr&, int)>;

View File

@ -15,7 +15,7 @@
#ifndef FAIR_MQ_MEMORY_RESOURCES_H #ifndef FAIR_MQ_MEMORY_RESOURCES_H
#define FAIR_MQ_MEMORY_RESOURCES_H #define FAIR_MQ_MEMORY_RESOURCES_H
#include <fairmq/FairMQMessage.h> #include <FairMQMessage.h>
class FairMQTransportFactory; class FairMQTransportFactory;
#include <boost/container/container_fwd.hpp> #include <boost/container/container_fwd.hpp>

View File

@ -9,9 +9,9 @@
#ifndef FAIRMQBENCHMARKSAMPLER_H_ #ifndef FAIRMQBENCHMARKSAMPLER_H_
#define FAIRMQBENCHMARKSAMPLER_H_ #define FAIRMQBENCHMARKSAMPLER_H_
#include "../FairMQLogger.h" #include "FairMQLogger.h"
#include "FairMQDevice.h" #include "FairMQDevice.h"
#include "tools/RateLimit.h" #include "fairmq/tools/RateLimit.h"
#include <chrono> #include <chrono>
#include <cstddef> // size_t #include <cstddef> // size_t

View File

@ -16,8 +16,8 @@
#define FAIRMQMERGER_H_ #define FAIRMQMERGER_H_
#include "FairMQDevice.h" #include "FairMQDevice.h"
#include "../FairMQPoller.h" #include "FairMQPoller.h"
#include "../FairMQLogger.h" #include "FairMQLogger.h"
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -15,8 +15,8 @@
#ifndef FAIRMQSINK_H_ #ifndef FAIRMQSINK_H_
#define FAIRMQSINK_H_ #define FAIRMQSINK_H_
#include "../FairMQDevice.h" #include "FairMQDevice.h"
#include "../FairMQLogger.h" #include "FairMQLogger.h"
#include <fairmq/tools/Strings.h> #include <fairmq/tools/Strings.h>
#include <chrono> #include <chrono>

View File

@ -7,7 +7,7 @@
********************************************************************************/ ********************************************************************************/
#include <runFairMQDevice.h> #include <runFairMQDevice.h>
#include <devices/FairMQBenchmarkSampler.h> #include <fairmq/devices/FairMQBenchmarkSampler.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

View File

@ -7,7 +7,7 @@
********************************************************************************/ ********************************************************************************/
#include <runFairMQDevice.h> #include <runFairMQDevice.h>
#include <devices/FairMQMerger.h> #include <fairmq/devices/FairMQMerger.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

View File

@ -7,7 +7,7 @@
********************************************************************************/ ********************************************************************************/
#include <runFairMQDevice.h> #include <runFairMQDevice.h>
#include <devices/FairMQMultiplier.h> #include <fairmq/devices/FairMQMultiplier.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

View File

@ -7,7 +7,7 @@
********************************************************************************/ ********************************************************************************/
#include <runFairMQDevice.h> #include <runFairMQDevice.h>
#include <devices/FairMQProxy.h> #include <fairmq/devices/FairMQProxy.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

View File

@ -7,7 +7,7 @@
********************************************************************************/ ********************************************************************************/
#include <runFairMQDevice.h> #include <runFairMQDevice.h>
#include <devices/FairMQSink.h> #include <fairmq/devices/FairMQSink.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

View File

@ -7,7 +7,7 @@
********************************************************************************/ ********************************************************************************/
#include <runFairMQDevice.h> #include <runFairMQDevice.h>
#include <devices/FairMQSplitter.h> #include <fairmq/devices/FairMQSplitter.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;