From 54e1777c004ec90a146d1b28b0596ad85c7fa0d1 Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Fri, 11 Sep 2015 15:38:16 +0200
Subject: [PATCH] Small adjustments for the new logger.

Both FairMQLogger and FairMQStateMachine use Boost Fusion internaly.
Because the state machine needs FUSION_MAX_VECTOR_SIZE 20 defined,
same value has to be defined in the logger, otherwise Fusion is not
properly compiled.
---
 fairmq/logger/logger.h               |  1 +
 fairmq/options/FairMQParser.cxx      |  4 ++--
 fairmq/options/FairMQProgOptions.cxx |  6 +++---
 fairmq/options/FairProgOptions.cxx   | 16 ++++++++--------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/fairmq/logger/logger.h b/fairmq/logger/logger.h
index 3bf9f851..d0ca4be3 100644
--- a/fairmq/logger/logger.h
+++ b/fairmq/logger/logger.h
@@ -15,6 +15,7 @@
 #define	LOGGER_H
 
 #define BOOST_LOG_DYN_LINK 1 // necessary when linking the boost_log library dynamically
+#define FUSION_MAX_VECTOR_SIZE 20
 
 // std
 #include <type_traits>
diff --git a/fairmq/options/FairMQParser.cxx b/fairmq/options/FairMQParser.cxx
index c38a59b0..5e7cc6a3 100644
--- a/fairmq/options/FairMQParser.cxx
+++ b/fairmq/options/FairMQParser.cxx
@@ -13,7 +13,7 @@
  */
 
 #include "FairMQParser.h"
-#include "FairLogger.h"
+#include "FairMQLogger.h"
 #include <boost/property_tree/xml_parser.hpp>
 
 // WARNING : pragma commands to hide boost (1.54.0) warning
@@ -171,7 +171,7 @@ FairMQMap ptreeToMQMap(const boost::property_tree::ptree& pt, const string& devi
     if (channelMap.size() > 0)
     {
         LOG(DEBUG) << "---- Channel-keys found are :";
-        for (const auto& p : MQChannelMap)
+        for (const auto& p : channelMap)
         {
             LOG(DEBUG) << p.first;
         }
diff --git a/fairmq/options/FairMQProgOptions.cxx b/fairmq/options/FairMQProgOptions.cxx
index ef735606..99583658 100644
--- a/fairmq/options/FairMQProgOptions.cxx
+++ b/fairmq/options/FairMQProgOptions.cxx
@@ -62,14 +62,14 @@ int FairMQProgOptions::ParseAll(const int argc, char** argv, bool allowUnregiste
     // set log level before printing (default is 0 = DEBUG level)
     std::string verbose=GetValue<std::string>("verbose");
     //SET_LOG_LEVEL(DEBUG);
-    if (fSeverity_map.count(verbose))
+    if (fSeverityMap.count(verbose))
     {
-        set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverity_map.at(verbose));
+        set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverityMap.at(verbose));
     }
     else
     {
         LOG(ERROR)<<" verbosity level '"<<verbose<<"' unknown, it will be set to INFO";
-        set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverity_map.at("RESULTS"));
+        set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverityMap.at("RESULTS"));
     }
 
     PrintOptions();
diff --git a/fairmq/options/FairProgOptions.cxx b/fairmq/options/FairProgOptions.cxx
index 42963c60..0007d47f 100644
--- a/fairmq/options/FairProgOptions.cxx
+++ b/fairmq/options/FairProgOptions.cxx
@@ -44,14 +44,14 @@ FairProgOptions::FairProgOptions() :
             )
         ;
 
-    fSeverity_map["TRACE"]              = fairmq::severity_level::TRACE;
-    fSeverity_map["DEBUG"]              = fairmq::severity_level::DEBUG;
-    fSeverity_map["RESULTS"]            = fairmq::severity_level::RESULTS;
-    fSeverity_map["INFO"]               = fairmq::severity_level::INFO;
-    fSeverity_map["WARN"]               = fairmq::severity_level::WARN;
-    fSeverity_map["ERROR"]              = fairmq::severity_level::ERROR;
-    fSeverity_map["STATE"]              = fairmq::severity_level::STATE;
-    fSeverity_map["NOLOG"]              = fairmq::severity_level::NOLOG;
+    fSeverityMap["TRACE"]              = fairmq::severity_level::TRACE;
+    fSeverityMap["DEBUG"]              = fairmq::severity_level::DEBUG;
+    fSeverityMap["RESULTS"]            = fairmq::severity_level::RESULTS;
+    fSeverityMap["INFO"]               = fairmq::severity_level::INFO;
+    fSeverityMap["WARN"]               = fairmq::severity_level::WARN;
+    fSeverityMap["ERROR"]              = fairmq::severity_level::ERROR;
+    fSeverityMap["STATE"]              = fairmq::severity_level::STATE;
+    fSeverityMap["NOLOG"]              = fairmq::severity_level::NOLOG;
 }
 
 /// Destructor