From 2a400850224d856b085f085184ce01dc0cd16473 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 17 Apr 2018 23:17:31 +0200
Subject: [PATCH 1/1] Cosmetics: move declaration.

---
 include/xbt/config.hpp | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index 6f3283562a..33adc28b94 100644
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -118,33 +118,24 @@ void bindFlag(T& value, std::initializer_list<const char*> names, const char* de
  *  </code></pre>
  */
 // F is a checker, F : T& -> ()
-template<class T, class F>
-typename std::enable_if<std::is_same<
-  void,
-  decltype( std::declval<F>()(std::declval<const T&>()) )
->::value, void>::type
-bindFlag(T& value, std::initializer_list<const char*> names, const char* description,
-  F callback)
+template <class T, class F>
+typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+bindFlag(T& value, const char* name, const char* description, F callback)
 {
-  bindFlag(value, *names.begin(), description);
-  alias(names);
+  declareFlag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
+                callback(val);
+                value = std::move(val);
+              }));
 }
 
-template<class T, class F>
-typename std::enable_if<std::is_same<
-  void,
-  decltype( std::declval<F>()(std::declval<const T&>()) )
->::value, void>::type
-bindFlag(T& value, const char* name, const char* description,
-  F callback)
+template <class T, class F>
+typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+bindFlag(T& value, std::initializer_list<const char*> names, const char* description, F callback)
 {
-  declareFlag(name, description, value,
-    std::function<void(const T&)>([&value,callback](const T& val) {
-      callback(val);
-      value = std::move(val);
-    }
-  ));
+  bindFlag(value, *names.begin(), description);
+  alias(names);
 }
+
 template <class T, class F>
 typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
 bindFlag(T& value, const char* name, const char* description, std::map<T, std::string> valid_values, F callback)
-- 
2.20.1