Fix -Wpedantic

This commit is contained in:
Dennis Klein
2020-01-22 15:44:28 +01:00
committed by Dennis Klein
parent 15de80cfd3
commit d608abf31c
5 changed files with 14 additions and 12 deletions

View File

@@ -60,7 +60,7 @@ FairMQMessagePtr getMessage(ContainerT &&container_, FairMQMemoryResource *targe
container.data(),
containerSizeBytes);
return message;
};
}
} /* namespace mq */
} /* namespace fair */

View File

@@ -18,5 +18,5 @@
void *fair::mq::ChannelResource::do_allocate(std::size_t bytes, std::size_t /*alignment*/)
{
return setMessage(factory->CreateMessage(bytes));
};
}

View File

@@ -80,7 +80,7 @@ class PluginManager
auto ForEachPluginProgOptions(std::function<void (boost::program_options::options_description)> func) const -> void { for(const auto& pair : fPluginProgOptions) { func(pair.second); } }
template<typename... Args>
auto EmplacePluginServices(Args&&... args) -> void { fPluginServices = fair::mq::tools::make_unique<PluginServices>(std::forward<Args>(args)...); };
auto EmplacePluginServices(Args&&... args) -> void { fPluginServices = fair::mq::tools::make_unique<PluginServices>(std::forward<Args>(args)...); }
auto WaitForPluginsToReleaseDeviceControl() -> void { fPluginServices->WaitForReleaseDeviceControl(); }

View File

@@ -62,7 +62,7 @@ ValInfo ConvertVarValToValInfo(const po::variable_value& v)
} catch (out_of_range& oor) {
return {string("[unidentified_type]"), string("[unidentified_type]"), origin};
}
};
}
string ConvertVarValToString(const po::variable_value& v)
{
@@ -443,4 +443,4 @@ void ProgOptions::PrintOptionsRaw() const
} // namespace mq
} // namespace fair
} // namespace fair