Cleanup base/MQ.

This commit is contained in:
Alexey Rybalchenko
2017-09-01 10:00:05 +02:00
committed by Mohammad Al-Turany
parent 334b91785b
commit 70e46a0b86
16 changed files with 81 additions and 38 deletions

View File

@@ -83,7 +83,7 @@ template <> struct Traits2<EventId::UpdateParamInt> { using signal_type = boo
class FairMQEventManager
{
public:
typedef std::pair<EventId, std::string> EventKey;
using EventKey = std::pair<EventId, std::string>;
FairMQEventManager() :
fEventMap()

View File

@@ -20,7 +20,7 @@
namespace FairMQParser
{
typedef std::unordered_map<std::string, std::vector<FairMQChannel>> FairMQMap;
using FairMQMap = std::unordered_map<std::string, std::vector<FairMQChannel>>;
FairMQMap ptreeToMQMap(const boost::property_tree::ptree& pt, const std::string& deviceId, const std::string& rootNode, const std::string& formatFlag = "json");

View File

@@ -296,7 +296,7 @@ class FairMQProgOptions : public FairProgOptions , public FairMQEventManager
}
}
typedef std::tuple<std::string, int, std::string> MQKey;//store key info
using MQKey = std::tuple<std::string, int, std::string>;//store key info
std::map<std::string, MQKey> fMQKeyMap;// key=full path - val=key info
virtual int NotifySwitchOption(); // for custom help & version printing

View File

@@ -208,8 +208,8 @@ class FairProgOptions
private:
// Methods below are helper functions used in the PrintOptions method
typedef std::tuple<std::string, std::string, std::string, std::string> VarValInfo_t;
typedef std::map<std::string, VarValInfo_t> MapVarValInfo_t;
using VarValInfo_t = std::tuple<std::string, std::string, std::string, std::string>;
using MapVarValInfo_t = std::map<std::string, VarValInfo_t>;
VarValInfo_t GetVariableValueInfo(const po::variable_value& varValue);

View File

@@ -94,7 +94,7 @@ inline std::string ConvertVariableValueToString<boost::filesystem::path>(const p
// policy to convert boost variable value into string
struct ToString
{
typedef std::string returned_type;
using returned_type = std::string;
template<typename T>
std::string Value(const po::variable_value& varValue, const std::string&, const std::string&, const std::string&)
{
@@ -110,7 +110,7 @@ struct ToString
// policy to convert variable value content into a tuple with value, type, defaulted, empty information
struct ToVarInfo
{
typedef std::tuple<std::string, std::string,std::string, std::string> returned_type;
using returned_type = std::tuple<std::string, std::string,std::string, std::string>;
template<typename T>
returned_type Value(const po::variable_value& varValue, const std::string& type, const std::string& defaulted, const std::string& empty)
{

View File

@@ -22,7 +22,7 @@
using namespace std;
typedef unordered_map<string, vector<FairMQChannel>> FairMQMap;
using FairMQMap = unordered_map<string, vector<FairMQChannel>>;
class MyDevice : public FairMQDevice
{