From 9a0a8c751645db6957c870824b67e04ffc450bca Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Wed, 2 Dec 2015 16:24:47 +0100
Subject: [PATCH] Add a acknowledgement channel to Tutorial 3...

  - ...to measure performance of the serialization libraries.
  - Rename `--log-color-format` cmd option to `--log-color`.
---
 fairmq/options/FairMQParser.cxx      | 19 +------------------
 fairmq/options/FairMQProgOptions.cxx | 14 ++++++++------
 fairmq/options/FairProgOptions.cxx   |  2 +-
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/fairmq/options/FairMQParser.cxx b/fairmq/options/FairMQParser.cxx
index 5e7cc6a3..59bd499b 100644
--- a/fairmq/options/FairMQParser.cxx
+++ b/fairmq/options/FairMQParser.cxx
@@ -15,24 +15,7 @@
 #include "FairMQParser.h"
 #include "FairMQLogger.h"
 #include <boost/property_tree/xml_parser.hpp>
-
-// WARNING : pragma commands to hide boost (1.54.0) warning
-// TODO : remove these pragma commands when boost will fix this issue in future release
-#if defined(__clang__)
-    _Pragma("clang diagnostic push") 
-    _Pragma("clang diagnostic ignored \"-Wshadow\"") 
-    #include <boost/property_tree/json_parser.hpp> 
-    _Pragma("clang diagnostic pop")
-#elif defined(__GNUC__) || defined(__GNUG__)
-    _Pragma("GCC diagnostic push")
-    _Pragma("GCC diagnostic ignored \"-Wshadow\"")
-    #include <boost/property_tree/json_parser.hpp> 
-    _Pragma("GCC diagnostic pop")
-#endif
-
-
-
-
+#include <boost/property_tree/json_parser.hpp>
 
 using namespace std;
 
diff --git a/fairmq/options/FairMQProgOptions.cxx b/fairmq/options/FairMQProgOptions.cxx
index 24190791..9ba33277 100644
--- a/fairmq/options/FairMQProgOptions.cxx
+++ b/fairmq/options/FairMQProgOptions.cxx
@@ -60,19 +60,21 @@ 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");
-    bool color_format=GetValue<bool>("log-color-format");
-    if(!color_format)
+    std::string verbose = GetValue<std::string>("verbose");
+    bool color = GetValue<bool>("log-color");
+    if (!color)
+    {
         reinit_logger(false);
+    }
     //SET_LOG_LEVEL(DEBUG);
     if (fSeverityMap.count(verbose))
     {
-        set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverityMap.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 DEBUG";
-        set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverityMap.at("DEBUG"));
+        LOG(ERROR) << " verbosity level '" << verbose << "' unknown, it will be set to DEBUG";
+        set_global_log_level(log_op::operation::GREATER_EQ_THAN, fSeverityMap.at("DEBUG"));
     }
 
     PrintOptions();
diff --git a/fairmq/options/FairProgOptions.cxx b/fairmq/options/FairProgOptions.cxx
index f768d71e..9242810b 100644
--- a/fairmq/options/FairProgOptions.cxx
+++ b/fairmq/options/FairProgOptions.cxx
@@ -42,7 +42,7 @@ FairProgOptions::FairProgOptions() :
                                                                     "  STATE \n"
                                                                     "  NOLOG"
             )
-        ("log-color-format", po::value<bool>()->default_value(true), "logger color format : true or false")
+        ("log-color", po::value<bool>()->default_value(true), "logger color: true or false")
         ;
 
     fSeverityMap["TRACE"]              = fairmq::severity_level::TRACE;