Add missing constructor for simgrid::config::Flag.

[simgrid.git] / include / xbt / config.hpp

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index 6f32835..5c2f098 100644 (file)
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -76,15 +76,7 @@ extern template XBT_PUBLIC void declareFlag(const char* name, const char* descri
 
 // ***** alias *****
 
-XBT_PUBLIC void alias(const char* realname, const char* aliasname);
-
-inline
-void alias(std::initializer_list<const char*> names)
-{
-  auto i = names.begin();
-  for (++i; i != names.end(); ++i)
-    alias(*names.begin(), *i);
-}
+XBT_PUBLIC void alias(const char* realname, std::initializer_list<const char*> aliases);
 
 /** Bind a variable to configuration flag
  *
@@ -100,11 +92,11 @@ void bindFlag(T& value, const char* name, const char* description)
   });
 }
 
-template<class T>
-void bindFlag(T& value, std::initializer_list<const char*> names, const char* description)
+template <class T>
+void bindFlag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description)
 {
-  bindFlag(value, *names.begin(), description);
-  alias(names);
+  bindFlag(value, name, description);
+  alias(name, std::move(aliases));
 }
 
 /** Bind a variable to configuration flag
@@ -118,33 +110,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, const char* name, std::initializer_list<const char*> aliases, 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, name, description, std::move(callback));
+  alias(name, std::move(aliases));
 }
+
 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)
@@ -218,10 +201,10 @@ public:
     simgrid::config::bindFlag(value_, name, desc);
   }
 
-  /** Constructor taking an array of aliases as name */
-  Flag(std::initializer_list<const char*> names, const char* desc, T value) : value_(value)
+  /** Constructor taking also an array of aliases for name */
+  Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value) : value_(value)
   {
-    simgrid::config::bindFlag(value_, names, desc);
+    simgrid::config::bindFlag(value_, name, std::move(aliases), desc);
   }
 
   /* A constructor accepting a callback that will be passed the parameter.
@@ -233,6 +216,13 @@ public:
     simgrid::config::bindFlag(value_, name, desc, std::move(callback));
   }
 
+  template <class F>
+  Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value, F callback)
+      : value_(value)
+  {
+    simgrid::config::bindFlag(value_, name, std::move(aliases), desc, std::move(callback));
+  }
+
   /* A constructor accepting a map of valid values -> their description,
    * and producing an informative error message when an invalid value is passed, or when help is passed as a value.
    */