Skip to content
Snippets Groups Projects

Draft: refactor: Remove usage of deprecated FairMQ classes

Open Florian Uhlig requested to merge f.uhlig/cbmroot:fix_deprecated_mq_classes into master
93 files
+ 1061
1025
Compare changes
  • Side-by-side
  • Inline
Files
93
+ 4
4
@@ -6,7 +6,7 @@
#include "FairMQDevice.h"
CbmMQChannels::CbmMQChannels(std::vector<std::string> allowedChannels) : fAllowedChannels {allowedChannels}
CbmMQChannels::CbmMQChannels(std::vector<std::string> allowedChannels) : fAllowedChannels{allowedChannels}
{
fChannelsToSend.resize(fAllowedChannels.size());
for (auto& entry : fChannelsToSend) {
@@ -46,7 +46,7 @@ bool CbmMQChannels::IsChannelNameAllowed(std::string channelName)
return false;
}
bool CbmMQChannels::CheckChannels(FairMQDevice* device)
bool CbmMQChannels::CheckChannels(fair::mq::Device* device)
{
// Get the information about created channels from the device
// Check if the defined channels from the topology (by name)
@@ -56,9 +56,9 @@ bool CbmMQChannels::CheckChannels(FairMQDevice* device)
// properly connected. For the time beeing this is done with a
// nameing convention. It is not avoided that someone sends other
// data on this channel.
int noChannel = device->fChannels.size();
int noChannel = device->GetChannels().size();
LOG(info) << "Number of defined output channels: " << noChannel;
for (auto const& entry : device->fChannels) {
for (auto const& entry : device->GetChannels()) {
LOG(info) << "Channel name: " << entry.first;
if (!IsChannelNameAllowed(entry.first)) return false;
}
Loading